Mostly ready with the new account type.

Still needs to talk about the new connection API to the Db by Michael (I don't get it?)