Part of me feels like this could be integrated into the make search somehow, but lets not force these two APIs together just yet...