Initial journal controller
Merge changes