**Warning: Do not use this commit**

This is an unfinished commit, to allow me to continue work on other computers.