Completely integrated journal

Managed to end up having desired behaviour.