Starting on improvement to simulator command