pushing up working branch
Merge pull request #27 from megsandman/old-state

pushing up working branch