Laying groundwork for command API
Renamed editor variable to e