Adding Local Storage and comments