Make database optional

I'm not 100% sure. Whenever PS hits this let's just port it.