Committing wholesale changes to get the q&a game working