Work in progress on new save format