Continued work on rewritten JS.