move make choice into class
source com