Services-and-Stuff-1fdcfda
 Services and Stuff Closes #57 (to my intent at least)