Refactored tracking

Now tracking missing wards