FASA Bugfixes, CMES WIP

CMES very much still a work in progress. Do not use.