Refactor Journal to Record, Add command handling
Merge