Shelving work and updating to 1.7