second commit

added a bunch of stuff