Begin adding thread tab support