Need to finish reorganize recursive + other iteratives
Final commit