First working version with modular command structures.