Refactored most components out of mustard.coffee