Fell down a rabbit hole. Can't move forward. Here's my work if anyone wants to pick it up and cram all night. :()
Merge remote-tracking branch 'origin/master'