Need to add option functionality