I'm happy to tackle this tomorrow (both new js file and new unit test file)