Added functionality to the questions interface
Fixed #335, hopefully. It's hard to test. I think it works though.