Revert "Revert"

This reverts commit 7d1213f2d08b5b61a7c86b167c7ef94e2e1a6c76.
Fixed

If crashes, comment out current before adding back in