First working version of adding literals to function calls