Added loops

Changed return types to a custom Churro return type to handle certain
cases
Updated test case to test loops