Added some better db connection ability?