Some tracking of arbitrary data is working. Need to clean this up a LOT