Add makey and discover

/cc @mickeynp