start making commands more self-contained