Finish up work on questions controller