A lot more work on the JS side of entities.