Added some services and filled in more functions, compiles