Beginning of saves rewrite