initial pass of tsp support finished