big commit

adding a bunch of stuff