Made some progress in handling function calls