Added Infix logic, still unfinished