Data refactored and back to running - tests still ne re-done