yey, mostly done, next going to move some 1.6 code back in for the 2 tiles