Updating Question to work w/new quesiton object