commit all
added the merged version of the 3 Task classes