progress
merged master
model and controller changes
route info
few changes
model tests
merge
commit