WiP - handle various option formats