Incorporating edits from PHB into new branch out of subdirectory.