added pcs for timey whimey stuff
Editable Comboboxes are evil.. need another soultion
TODOs
Fixed merge conflicts