Changed accounts to use inheritance,
Reworked to work with Inheritance.  Easier to use
Misc