Initial implementation of task consolidation.  Still using a special Spark build.