Jeff - extract dhis2 related logic to its own class