Commit 2

Added an StateRef to Entity
Added some new features to the input classes.