Starting to fix recursivity errors