Revert "Almost Final"

This reverts commit d829e65c95db9e45724c2c349468defad520497e.