Tracker base rewrite complete