Fixed bugs with new startup, REALLY need to switch to using promises, my async callbacks are getting really messy