Wrapping up correct functionality for popup/vals
Fixing conflicts