Progress

[davemoore22]

OK, I'm having to do a bit of a refactor (see the latest series of commits) to stop things be so hideously overengineered, simply the code, and most importantly reduce the overall compile time (even running on 3 parallel cores, current time for a full compile is over 3 minutes).