Started adding in domain and denormalisation logic