Starting refactor to fix arc joins.