Bit of mess, but wip towards task operation.