Started converting to 1.7

Initial commit into forked branch