Tracking everything now properly