created a branch db_handling_improvements for Shell in case I mess something up while working. Remember to merge this when it is tested and working!