Issue #322 part 1 and part 2 redux a bit.

This should make part 1 and part 2 workable now.  It can be
made a bit prettier, but it does currently function and
therefore shouldn't hold up 0.15.