.
cleaned up some of the code
Finished everything with the comments except editing
Merge pull request #10 from calebthill/comments

WIP