With fundamental data structures complete
(including successful read and write to disk)
(some testing methods removed)