Revert "First Version of this"

This reverts commit 96925f4847f88da46d41abfb225f4e79988b308f.