Start of refactoring Journal