Recursion sort of works now
Minor commits