Another great commit, lots of stuff!