Commented through the Key class. Will need to commit earlier coments from lab pc.
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision