Cleaned up Task model, but still has bugs