Finish Add16

A very tedious process. Used vim replacement commands for automation
and ran successfully in tests