WIP to replace tracking table with tracking view