Start of conversion to std::vector and std::complex