wrapping up some property selection button work