Activated Magellan. Some kinks to work out.
Fixed merge conflict.