Extracting state logic into a reducer (100% finished)

Extracting state logic into a reducer (100% finished) #480