Changed some function locations for box and surface. Transform now works (I think!)