Jon's changes to dbutil, home, and router