start changing db class - not finished