Add better ID extraction.
Merge?