Add old spectrum code ... to be reviewed / sorted out!