added commander module
totally reworked