#broken 20 Test are still remaining to fix. Nearly done with refactoring our model structure