Feat/account

See inline comments for more information