First meaningful commit (added all pre-git edits).
Commented the code and moved it around a bit.