Some extra work, now migrating to coffeescript