Missed a few conflicts. Fixed those and merging again. This is a haiku.