Re-factor using latest helpers, update Conn to UI and take into account clicks/keypresses. Need to refactor middleware tests still.