Interim checkin: refactoring stop parsing / updating map