Redux version.  I looked back over the old version and tweaked a couple things I didn't like so much.

Hope this is better!