updated World

Can't see why shape1...3 are undefined... will work more soon