grim/wasdead

Lots of updates and a bit of code moving around
draft
2020-01-22, Gary Kramlich
d82f4509dbbd
Lots of updates and a bit of code moving around
db/