Checkpoint before yet another dog walk (does it ever end?)
Forgot to incldue basic smoke test to check for NPEs and such