Revert "Revert "SAPE up redux""

This reverts commit 1ce55777b4f868850c2136948d503884128cd64f.