Add a whole bunch'a stuff, almost done