substituted 'idea' for 'question' where I'd missed it the first time around
upstream should reflect same packages as local
more dumb stuff I missed before
more stuff I missed on swapping questions with ideas
fixed issue with adding ideas