Work on making client side models inteligent
Resolved conflict