Revert "Work from Tuesday -- not funtional."

This reverts commit 197502c7c06351eb9a8a6f74c0a7a1bc6a74c7a0.