A redo of PWA2 -  hopefully i won't screw this one up