Added test.
Alternate field names to handle 2 versions of FM.
Variable type inferencing, local scopes.
Doc changes