Fixed compile errors - can continue separating out service