**Do not merge!** Refactor maternity paternity flow