Some changes to db; tests; computation. This is not a stable commit