Add Services

Model and service changes to support services

#22