refs #9- changed data model- refactored services- made test work againSigned-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>