Add Spectrum back in
Finished most of the refactoring