ACTUAL commit
Extra testing gear- stable commit before possible big reworking
Mostly finished restructuring #2
Refactoring of code complete - now in a non-headwreck layout :)