Adding more macros for new model notation.
More work on dpp ms.

Working on model description.