experiment with tasks.  Not complete.
Fixed check-in mistake
renamed and deleted old classes