Split out ECM, add QS (SIMPQS from old FLINT)