Started whole bunch of rewriting stuff.