task class added plus a couple edits