Started fiddling with ComboBox stuff

Author: @akshoop