More editing and spatial formatting. Need structures