Moar and moar! Database stuff is coming together