Now alings variable locations.
Adds support for function definitions.