Add a question functionality now working
Fixed merge conflct