Big Commit

Putting stuff in