Pre - Map Object Grouping

Working build before attempting to group properties into a map object