Port more command logic. Wrapping up before leaving work.