Revert "First completed version"

This reverts commit 9438ce48eae9b9175db0adbc39335491221424f4.