Add task and user models
Fix merge