Refactored Commanderserver
Corrected commander
Refactored add mechanism to allow echo