more saving and exporting stuff also class based naming