Commit 1

Cleared up some comments and rearranged some functions.
Continued reorganizing.

Reorganizing