Newer Database - Fixed Edgar's problems and added saved data