Re-thought handling of entities, visuals and spatial data. Changed test data and storage specifications accordingly.