Add in attractors.
Resolve merge conflict.