Restructing a bit.
Separated out the work on Maybe and state.

Starting on State now.