Very preliminary AE2 support