Big Commit

Sorting things out!!!!