Final merge of everyone's code.

Fixing Mark Branch