Added initial work for funciton calls.