fleshed out taskmaster a little more