Manually merged Nicks changes. Now have mock discovery activity