Save script refactored, basic functionality works as well as for builder