Feature: make this multi task friendly

This is also backwards compatible.