More changes. Getting close. Need to figure out triggers for alerts.