stuff committed before switching to mac
localstorage for marionette