More DB work
Still cleaning up