Add saving
Proper file save