Adding in a whole bunch of functions that weren't being tracked before. Oops\!