Commenting. Moved Name to Settings