Separate out common parts of T7, add RT, add volume tracking