Big update, WIP but accessible features work