More work.
Merge branch 'master' of https://github.com/alohomoraSecurity/torsion