Refactored for behaviors
Merge remote-tracking branch 'origin/cryptoRedo' into introProtocol