closes #12
closes #11
fixes #16 moving the parameter naming to command execute