Revert "First uncompleted version"

This reverts commit 88e3b6a942a267ec3722d70504f4ecc555e0d2cb.
Update