major surgery, moving a BUNCH of stuff into Types