Completed Initial work on Settings