New build

Bunch of new TBR features