Big change in architecture, Command Pattern implemented