Robust joining

Also added animations, generalized Dynamics, and visualized energy
sources.