Updates as I've had to make changes as I add in historical data from our flock. Found a bunch of corner cases where more tables were needed.