added task model, updated router
changes from master