Continue to build on JS total functionality