added some combobox logic
Merge branch 'master' of https://github.com/reaverDK/giganten