PBP Edit stuff, almost there...