Did my scrumy stuff, refactored some code, helped ryan out a bit
Merged