Changed around a bunch of files. They don't work the way I want but this is due tomorrow.