starting to add some of the responsiveness