1658 promised 2

OK TO REVIEW NOW

Here so that you can monitor the progress!