Revert "Revert "Some testing""

This reverts commit 80737d21b4fd71639c0d500d2dd5d12a8a3c90c1.