Preliminary refactor of consoleCommands