Starting business logic changes
Merge branch 'master' of github.com:scott-thomson/carers