Saving work
1st attempt at fixing the saving mess
s