Major refactoring; solved several new problems; started working on several more.