More Database prep work