Updating to version #2

The moment is here!

Don't approve the PR for a day or two, because I might make a few minor changes. But this is what the code will look like soon.