t2 mostly merged
Most of t2 is in there now