Initial commit of 07/18 code