First commit of our upcoming v4! :)