Spectrum refactor

Andrew Quinnrequested to merge
spectrum-refactor into master

Major updates to spectrum submodule and related functions.

Merge request reports