Cleaned up the Code, lots of new Features!
Looks like a usable State, needs testing now!