Merge pull request #9 from mchizews/master

Changes to bring code to "working" order again
Changed State component to conform to UML