Cleaned code
Created models
Resolved conflicts, improved unit test, updated results