Starting to add encryption functionality