container and unit tests complete.  refactored client_account to use container mixin.