States Final

-Implemented the rest of the states stuff