Added PMs -- Further testing required
Fixed merge conflicts