Add another recursive handling piece of logic to try to make this work