P3d changes

Almost ready to be in game