Revert "Revert "poss sr derp""

This reverts commit 179106b30082b9451549e0d49aba4c879455ce3b.