added a bunch of new stuff. i suck at git