Add donmans changes (complete with syntax errors), ready for review next week