Conform to new changes

No need to separate a command listener... Maybe I should name it that?
NOTE: rename ss_commands to ss_cmdlistener