Add modular commands, closes #10