Got rid of excess classes; implemented basic internal task support.

Can this be a class member?