begin modularising saving