Changing DB to get everything first instead of changing interfaces. reverting last comit