New data structure complete in place (as far as I can tell). Saving bugs fixed. Removed two unused legacy files that should never be used.