Almost there

Missing:
Note
Return encryption
small changes to user