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