Merging

Merged several TBA methods under Box methods - less exports now!