More changes to seclude the pm system to itself, still some changes to make before its totally isolated