Maybe sorted out the mapper. Summarisation still to come