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