/command-pattern

Refactoring to patterns: replace conditional dispatcher with Command

Watchers