An update to Pink Diamond, and more progress too! Lots of edits...