starting with re-factoring Limpopo functionality