Moving stuff into files. Stole a lot of new stuff.