moved some stuff around. added some comments
Merge pull request #4 from ToxicBakery/matt

moved some stuff around. added some comments