Added a primitive version of accountManagement that need some linking to work properly.
Merge remote-tracking branch 'origin/master'