Added World, but haven't worked on it. Added Location and have got the basics done