More work.
More work on js. Cleaning up cmake