Base design for EasySpeak
Fix merge errors