Factoring out DB...no worky