First/last commit.
Now it actually works!