Added Cell and World classes