Refactored more, added multiple state views.