Continued debugging - almost there