Working on states, broke entities

The entities are broken and Need to be fixed. I have states working, but
there is not meat. I need to add functionality to the states.