Small work in preperation for db