ENH: first steps toward addressing #21

**NOT READY FOR MERGE**