More changes and refactoring, adds timbre for logging.