Data model now includes improved API
First 3 tests check out ok