Aaaaall of the changes

Commit.