Got basic data layout together and basic map looking OK