Code Version as of 6/28

Code version as of 6/28