Refactoring main to make it a little cleaner
Merge branch 'moar-building' into refactor-configs