TODOs
Switch to using object lterals to load entities, anticipating JSON load/save