Start to implement the new save code