fixed broken services code
begin cleaning up the way models are nested between each other