CommandMode now a better singleton class