more work on model -- merged client_manager into it