Bug fixes
Branching for GUI and CMD line builds
Setting up for build differentiations