db work added and...some tests sucks