[WIP] HERP DERP

A massive commit, just to save some work in progress.