Revert "Work in progress"

This reverts commit 4ff5b5b9ba830be6a1748bcc2658b58ddb3b5e8e.
Work in progress