oops. haven't comited in a bit, added a bunch of stuff. I'm a bad developer