Fix glass coordinates for rotation
Move glass code to Glass