Moving towards lib based save/load