Minor re-organization.
Added reader/writer impls.