Adding command switches as this has matured into a multi purpose tool