Refactor - another stab - reminders work again - second reminder display is still TBD