Continued conversion to livescript, and trying to get tests to pass.