Revert "Still Work in progress"

This reverts commit 000c81bbf19c6efd57c585fadfb04d29941ce4fa.