Stronger crypto

Closes #144 
I believe this is in backwards order, I think the first item is the highest priority one?