[WIP] Extract Father from Orphan

## WIP, seeking feedback. Do not merge!

The changes below break the importer.