@pjackson28 does this need to respond to escape as well