Added drawable, and world classes