adding a whole bunch of service stuff, some app stuff, and a current dir check