No clue what I did here but no sense in losing it.
Reorganizing
Improving preprocessor hack
Build hack intact