Added more stuff. I was in a hurry, so some of the code is sloppy. I need to go in and clean up the last bits.