Refactoring.
More State refactoring.
Cleaned away Hash.
More cleanup.
More cleaning.
More cleanups.
Moved stuff into State module.