More work done on base tracker class