Refactored code, framework for Bartz experiments, though doesn't seem to converge...