Moved some stuff and added a part
Merge pull request #1 from keenanjohnson/testbranch

Moved some stuff and added a part