One or two more commits and this will be finished :-)