Efficiency tweaks
Added a TODO to the command API