Fixes #1

This should work; at least it is a lot better than it was.
All milestones met.