Iterative checkin

Updating services for Ch 4
- moving from factory to service
- removed cruft per Joel Hooks feedback