Revert "Revert "Added the first bit of untested code.""

This reverts commit 50038ac766e0bd7ff85484a07ced04e8fff9b88b.