Trying step two. WIP
Simplifying code
Steward model. Tests.
clean up
Cleaned up