Discovery WIP (thanks to Ohad for initial STI work)