Near final commit for week 1, have my services set up