New command interface is almost done...