Some work on #46

Check https://github.com/codecombat/codecombat/issues/46 for more info