Couple corrections to the solution posted above after more testing this evening.