Added model binder
added todo