First pass of discover.el