First stab at new PP system