Some work on task execution, cleaned up some old ideas