Add DynamicOrphan
Refactor clean various cruft
Remove a bunch of cruft. Also re-namespace all private methods with _