Added number selection. Added TODO.