WIP - Add tests and improve reparent action.