Revert "Revert "This thing still doesn't work""

This reverts commit 89d87720a5586dfa0acb681ed8bec544b7660b05.