Originally Posted by Chukpike
And I did not, as the Waffen SS included all the SS.
This is incorrect, the Waffen SS were the military branch of the SS only, my understanding is that the SS was reorganised into the 3 separate branches in 1935-36 but in 1939 Hitler merged the Totenkopfverbände and Allgemeine.
Had you been talking about the overall Schutzstaffel you possibly would have been correct as they all had the same motto but as you specifically stated Waffen SS I think it safe to say that you have it backwards, the SS included the Waffen SS not the other way around.
Here is the organisational chart for the SS, the Waffen SS is the box at the very bottom right labelled SS-Verfügungstruppe.
Concentration camp guards and "special units" are in the box next to them marked SS-Totenkopfverbände.
The "General SS" which was mainly administrative, part time and Reserve, honorary or otherwise non-active SS members is the box at the bottom on the left labelled Allgemeine SS.