Auth / actions refactor, WIP