Setup for Wednesday branching.

I'm beginning to think I may not have time to complete this how I want
within the week so I'm going to branch here, try to keep it snazzy, but
if time is running low I will come back to here and write it sloppy but
functional to ensure I have a test entry.