Revert "First working version"

This reverts commit 4f6fefcf4f7accc294f7665c4df824a2440fde4a.