Added some question stuff. This might break things.