Moved AAASH and FDASH to a subclass (each)
Moved AAASH and FDASH to a subclass (each)