Added World and Player classes