Update task handlers
Tests working somewhat decently for task handler