Removed ability for state to return machine. This is not needed since we moved setting new state to transition.  This will make adding internal states easier as well.
Added user entity