Pruned equations working
Resolving merge conflict for oscar_outline, minor import differences