WIP
Whole bunch of new stuff.