Member rename
Cleanup and debug
Rewrite save/load methods