Major Commit

The majority of the code is done.