initial hacks on db for per-run db and server