get popover working
note tidy up