probably something for next iteration.  Don't think I want to play with more structure right now and especially not in this pull branch.