Added torus and stuff!