fresh build, labeled refactor to 1.7