Tested the states, seems to work. Made some minor refactors with lines.

Added the test states to show it works, it can be removed later