Almost there with the PM conversion. Still debugging.