First of several major changes; World class has become World and Solver classes