Really adding the button handling code this time