Added the rest of the challenge generation.  Should be complete, though not well tested, at this point.