Merge Steve Murphy's (murf) complete re-implementation of AEL, which is now no longer...