2.5dev

Merged all of EMC and Chuck's code changes.