Started adding encryption