PNight and Charity CRUD complete

Finished up all the crud.   hooray!