These two files should eventually be gotten rid of, and some kind of class
should be created to take care of all this stuff. But since I'm still figuring
it all out, its all messy for now
