More database crap

wheeee!