ditching coffeescript to make this diff-able w/ core