Updated AnswerGen to Use Number
Fixed somthn in Context