Better encryption

Closes #1 #2