Add basic crypto support (alpha)
Merge branch 'crypto'
Housekeeping