Still ugly, but all the messaging is functioning as expected