Feature/journalizer

Still need to add some tests...