Refactored startup
Merge pull request #1 from trevorparscal/startup-refactor

Refactored startup