work on accountmanager refactor, very WIP
more wip refactor
finishing refactor work

slight work