Cleaning up some more link from the ADT.
Doing some renaming so I can get a handle on the state that is actually changing.