merge of peakpado's submission with latest master.   Works except New Challenge redirects to load random data