More task scheduling. Fixes #199