6/25 AM progress
more updates to unit tests, services, managers