Began implementing the combo select box

Also included is another framework restructure.