Conditional alerts

Several bug fixes, assumption corrections, etc to get the transition actually working