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