Adding confirmation behaviour

https://www.pivotaltracker.com/story/show/57978832