Commit of some conditional functions and Initial support for FunctionUnits.

Commit of some conditional functions and Initial support for
FunctionUnits as per nant syntax