MPG: Finished work on options. These now appear to work, including vector option types with and and without initilisation