Encryption implemented, location class added