5.4 PTR Update

Filled in more of the Sub restructuring. Still not happy with the
current model, but it's crunch time.