yet more changes to db interaction. Step 5..