Tracking nodes

Added tracking calls to what seem to be all the areas of interest.