Some work on the switch to JSON based element system.