Mostly done, just gotta change table of contents and list of figures/tables and such