1658 promised 2

DON'T MERGE THIS YET

Here so that you can monitor the progress!