Added rest of combo box options

Works but still hard coded