adding mappings learned from Marionette 2.0.0 Release Notes
todos and blablas