Fixed inf recursion. Was missing a return. More debugging to do.