Redoing a whole bunch of stuff. WIP