Torus added (not complete; do we even need this?)