tons of stuff + refactor of the account controller