added stuff
removed reference to db class, not needed