Added the question text into the asking function. Also added more TODOs.