Add builtin functions handling
Add comments
Expand doing nothing.