More work on BOM detection. Still not complete.