Almost done changing the objects to allow collumn mapping.