TS stuff works. Cleaning things up to get a big picture.