WIP
OptionGroups and Option added
merged with branch work