Many changes

Do not use!
Not verified and not finished