Revert "First working version"

This reverts commit 6d0f39736e66549d2641b8669277f33b0f09237e.