Final changes before break

Implement hash and encryption needed