EDO good to go with notes
Preparing for merge
merging complete, hopefully