Initial db structure nearly complete