Still need popover and retain val and cancel