Split out into individual parts per #1.