Rough draft of some simple state and modifiers, tests have coverage up, still need more before continuing.