Added fas implementation

Readded layer merging strategy
Implemented amconvert
Made first set of plots since restructure