Flesh out more db stuff