Initial stab at service objects
Cleanup/License
Minor fixes