Continued work on issue #34

Things look good, tests passing, better comments. Now just need to sleep
on this.