refactor to use Tash and prepare for results