made ampm a combo box and added keypad, not fully implimented