WIP: refactoring; most tests passing w/new record-based impl
WIP: refactoring tests to work with Record stuff