Changes to PNight CRUD

WIP