One big and ugly commit before integration with the other
One more ugly commit before showdown.