minor naming fixes
initial class based reimplementation of Task()