Revert "Half way through"

This reverts commit 7daee8f5ca02de09d95e0c959f8ccc7b1cd931cc.
Half way through