MAJOR: Continuing rework on crypto and ClientCommand