Static integration of the new PSM

Reference #3932

Take this, and make it work.