Gradually slogging through revamp; split source into more convenient file structure.
Cleaning up design spike syntax in tests. Good practice for when to unwrap Optionals....