MASHUP - secrets/demons (not done)

Modified