Made some changes to code. Fixed some things. Broke some other things. Still very much a work in progress.