TEMP: Add close & stop cmds