First working version of the journey editor.
Manual merge.
DAT CLEANING