Smarter PM

More to come.