Changes before Christmas

Changes before Christmas, before working on saving everything before new
year sandbox refresh