Issue ID #28 Refactored playing JS