Final update 2

They are happy
Final 3

Trying to commit changes, although I don’t know what the hell is asking
Trying to fix merging problems