Initial 1.7 changes; VERY BROKEN