Infrastructure work
Mad scramble for rewrite
Mechanics sort of working
Removed old junk