Cleaned up startup a bit.
Merge branch 'feature-bacon' into feature-startup
Merge branch 'feature-startup'