- Work on commands. Still not thread safe