Redux

Here's the final version with a few more tweaks.