Tombstone model

I'd like to remove the tombstone screen for several reasons, but let's not break everything at once, so here's a replacement model.