committing changes before break
Just refactored. About to go to dinner.