refactgor
Wrap harder
Fix reference/symbolic?