Very preliminary but working well version of Fast and Best stages for upgrade Tracking. Some cleans up already done, more needed in the future. @sstahl @tnikodem @mwhitehe