Catchup work

All work done so to catch back up after missing a day, using Justin's
work as a guide.