Working on rebuilding objecttracker