Added commandGroup/command basic support. Slight refactoring into other multiple functions.