Initial Commit
Settings update