First step in simplification.
Continued simplification and bug fixes.
Better logging.
Fixed allegedly better logging.