Merge pull request #4 from DaveTsunami/feature-1134b

big feature 1134b
Revert "Merge pull request #2 from DaveTsunami/feature-1125m"

This reverts commit 516d6eff893dce1d474187f957b53587a4c373ea, reversing
changes made to c30e54eb96bd5833c29713984928ee7286116c1c.
Revert "Merge pull request #4 from DaveTsunami/feature-1134b"

This reverts commit fa67845c0cf370d6bf624a998be9d3d3721edfd7, reversing
changes made to 516d6eff893dce1d474187f957b53587a4c373ea.