diff --git a/report.txt b/report.txt
new file mode 100644
index 0000000..b91ceec
--- /dev/null
+++ b/report.txt
@@ -0,0 +1,8 @@
+Library Management System
+in project shamel 5 class ast ke ebaratand az class Main - class Book - class Library - class User - class librarian
+class main : bakhsh asli in class ro function runMenu tashkil mide. dar in function ma menu asli ro baraye karbar load mikonim. karbar bayad az beyne 2 gozine users va librarians yeki ro entekhab kone. karbar harkodam ro ke entekhab kone 2 gozine moshabeh barash bala miad ke yeki sign up va digari sign in hastesh ke baraye horkodam function tarif shode. vaghti karbar varede account khodesh beshe gozinehaye jadidi barash load mishe ke in gozine ha baraye user va librarian fargh mikone va in gozineha ba function haye userMenu va librarianMenu load mishe. harkodam az in gozineha ham be surate function tarif shode ke az ruye esme har function mishe be kari ke anjam mide pey bord. dar nahayat function runMenu dar function main seda zade shode.
+class Book : in class shamele attribute hayi hastesh ke az esmeshun malume ke chi hastan. baraye hameye in attribute ha function haye getter va setter tarif shode. hamchenin function toString ke etelaat marbut be ketab ro return mikone tarif shode.
+va yek function baraye taghir dar dastrest budan ketab ba esme changeAvailableStatus.
+class Library: in class bozorgtarin va mohem tarin class ast. dar in class 3 arraylist az books , users va librarians sakhte shode ke darvaghe ma dar in 3 arraylist etelaate marbut be ketabha va karbar ha va ketabdar ha ro zakhire mikonim. in class shamele function haye ziadi hast ke az esme har funciton mitavan be karayi un function pey bord.
+class User : ma dar in class 2 attribute baraye user tarif kardim ke ebaratand az String username va String password. baraye in 2 attribute function haye getter va setter tarif kardim. hamchenin yek function changePassword baraye taghir password user tarif kardim. az unjayi ke user mitavanad ketab gharz konad va ketab hayi ke az ketabkhane gharz karde ro pas bedahad , ma yek arraylist rentbooks tarif kardim va 2 function ba nam haye rentBook va returnBook ke in 2 funciton ba tavajoh be esmeshan ketab gharz migiran va ketab gharz gerefte shode az ketabkhune ro pas midan. function toString ham etelaat marbut be user ro be surate yek string return mikone.
+class Librarian : in class ham manande class User daraye 2 attribute username va passrword hast. va baraye in 2 attribute function haye getter va setter tarif shode. hamchenin yek function changePassword baraye taghir passsworde librarian tarif shode. function toString niz etelaate marbut be librarian ro return mikone.
\ No newline at end of file
diff --git a/src/main/java/Book.java b/src/main/java/Book.java
index 7cff6f8..f6c6378 100644
--- a/src/main/java/Book.java
+++ b/src/main/java/Book.java
@@ -1,3 +1,68 @@
 public class Book {
     //Book should contain name,author,year of publish and ISBN
+    private String name;
+    private String author;
+    private int yearOfPublish;
+    private String ISBN;
+    private Boolean isAvailable = true;
+    /* public Book(String name, String author, int yearOfPublish, String ISBN)
+    {
+        this.name = name;
+        this.author = author;
+        this.yearOfPublish = yearOfPublish;
+        this.ISBN = ISBN;
+    }*/
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public int getYearOfPublish() {
+        return yearOfPublish;
+    }
+
+    public void setYearOfPublish(int yearOfPublish) {
+        this.yearOfPublish = yearOfPublish;
+    }
+
+    public String getISBN() {
+        return ISBN;
+    }
+
+    public void setISBN(String ISBN) {
+        this.ISBN = ISBN;
+    }
+
+    public Boolean getAvailable() {
+        return isAvailable;
+    }
+
+    public void setAvailable(Boolean available) {
+        isAvailable = available;
+    }
+
+    public String toString()
+    {
+        return "Name: " + name + " " +
+                "Author: " + author + " " +
+                "Year of publish: " +  yearOfPublish + "" +
+                "ISBN: " + ISBN + "" +
+                "Is available? " + isAvailable;
+    }
+
+    public void changeAvailableStatus(){
+        this.isAvailable = !isAvailable;
+    }
 }
diff --git a/src/main/java/Librarian.java b/src/main/java/Librarian.java
index 321ce3a..68a77da 100644
--- a/src/main/java/Librarian.java
+++ b/src/main/java/Librarian.java
@@ -1,10 +1,59 @@
-public class Librarian {
+import java.util.Scanner;
+
+public class Librarian
+{
     /*
     * The librarian should have a username and a password
     * The librarian should be able to search users, librarians and books
-    * The librarian should be able to add\remove\update user add\remove\update_
-    _ librarian and add\remove\update book
+    * The librarian should be able to add\remove\ update user add\remove\ update_
+    _ librarian and add\remove\ update book
      */
+    Scanner input = new Scanner(System.in);
+
+    private String username;
+    private String password;
+    /* public Librarian(String username, String password)
+    {
+        this.username = username;
+        this.password = password;
+    }*/
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void changePassword(){
+        System.out.println("Enter your currenct password :");
+        String currentPassword = input.nextLine();
+        if (currentPassword.equals(getPassword()))
+        {
+            System.out.println("Enter your new password :");
+            String newPassword = input.nextLine();
+            this.password = newPassword;
+        }
+        else
+        {
+            System.out.println("Wrong password!");
+            changePassword();
+        }
+    }
 
 
+    public String toString()
+    {
+        return "Librarian's username: " + username + " " +
+                "Librarian's password: " + password;
+    }
 }
diff --git a/src/main/java/Library.java b/src/main/java/Library.java
index 6c34354..2875c7e 100644
--- a/src/main/java/Library.java
+++ b/src/main/java/Library.java
@@ -1,3 +1,7 @@
+import java.util.ArrayList;
+import java.util.Scanner;
+import java.util.HashMap;
+
 public class Library {
     /*
     * The library should have a list of books.
@@ -7,78 +11,271 @@ public class Library {
      */
 
     //book related functions
+    ArrayList<Book> books = new ArrayList<>();
+    ArrayList<User> users = new ArrayList<>();
+    ArrayList<Librarian> librarians = new ArrayList<>();
 
-    public void addBook(){
-        //TODO
+    Scanner input = new Scanner(System.in);
+
+    HashMap<String , Integer> numberOfBooks = new HashMap<String , Integer>();
+
+    public void addBook(Book ketab){
+        if (!doesBookExist(ketab))
+        {
+            books.add(ketab);
+            increaseBook(ketab);
+        }
+        else
+        {
+            System.out.println("We have already had this book!");
+        }
     }
 
-    public void removeBook(){
-        //TODO
+    public void removeBook(Book ketab){
+        if (doesBookExist(ketab))
+        {
+            for (int i=0; i<books.size(); i++)
+            {
+                if (ketab.getISBN().equals(books.get(i).getISBN()))
+                {
+                    books.remove(i);
+                    decreaseBook(ketab);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            System.out.println("This book does not exist!");
+        }
     }
 
-    public void searchBook(){
+    public String searchBook(Book ketab){
         //TODO
+        for (int i=0; i<books.size(); i++)
+        {
+            if (ketab.getName().equals(books.get(i).getName()) && ketab.getAuthor().equals(books.get(i).getAuthor()) && ketab.getAvailable()==true)
+            {
+                return ketab.getISBN();
+            }
+        }
+        return "";
     }
 
-    public void updateBook(){
+    public void updateBook(Book ketab){
         //TODO
+        if (doesBookExist(ketab))
+        {
+            for (int i=0; i<books.size(); i++)
+            {
+                if (ketab.getISBN().equals(books.get(i).getISBN()))
+                {
+                    books.get(i).changeAvailableStatus();
+                    break;
+                }
+            }
+        }
+        else
+        {
+            System.out.println("This book does not exist!");
+        }
     }
 
-    public void doesBookExist(){
+    public Boolean doesBookExist(Book ketab){
         //TODO
+        Boolean existence = false;
+        for (int i=0; i<books.size(); i++)
+        {
+            if (ketab.getISBN().equals(books.get(i).getISBN()))
+            {
+                existence = true;
+                break;
+            }
+        }
+        return existence;
     }
 
-    public void increaseBook(){
+    public void increaseBook(Book ketab){
         //TODO
+        int number = numberOfBooks.get(ketab.getName()) + 1;
+        numberOfBooks.put(ketab.getName(), number);
     }
 
-    public void decreaseBook(){
+    public void decreaseBook(Book ketab){
         //TODO
+        int number = numberOfBooks.get(ketab.getName()) - 1;
+        numberOfBooks.put(ketab.getName(), number);
     }
 
     //user related functions
 
-    public void addUser(){
+    public void addUser(User karbar){
         //TODO
+        if (!doesUserExist(karbar))
+        {
+            users.add(karbar);
+        }
     }
 
-    public void removeUser(){
+    public void removeUser(User karbar){
         //TODO
+        if (doesUserExist(karbar))
+        {
+            for (int i=0; i<users.size(); i++)
+            {
+                if (karbar.getUsername().equals(users.get(i).getUsername()))
+                {
+                    users.remove(i);
+                    break;
+                }
+            }
+        }
     }
 
-    public void searchUser(){
+    public void searchUser(User karbar){
         //TODO
+        if (doesUserExist(karbar))
+        {
+            System.out.println(karbar);
+        }
+        else
+        {
+            System.out.println("This user does not exist!");
+        }
     }
 
-    public void updateUser(){
+    public void updateUser(User karbar){
         //TODO
+        Scanner input = new Scanner(System.in);
+        if (doesUserExist(karbar))
+        {
+            karbar.changePassword();
+        }
+        else
+        {
+            System.out.println("This user does not exist!");
+        }
     }
 
-    public void doesUserExist(){
+    public Boolean doesUserExist(User karbar){
         //TODO
+        Boolean existence = false;
+        for (int i=0; i<users.size(); i++)
+        {
+            if (karbar.getUsername().equals(users.get(i).getUsername()))
+            {
+                existence = true;
+                break;
+            }
+        }
+        return existence;
+    }
+
+    public Boolean userPasswordCheck(User karbar)
+    {
+        Boolean passCheck = false;
+        for (int i=0; i<users.size(); i++)
+        {
+            if (karbar.getUsername().equals(users.get(i).getUsername()))
+            {
+                if (karbar.getPassword().equals(users.get(i).getPassword()))
+                {
+                    passCheck = true;
+                    break;
+                }
+                else
+                {
+                    passCheck = false;
+                    break;
+                }
+            }
+        }
+        return passCheck;
     }
 
     //librarian related functions
 
-    public void addLibrarian(){
+    public void addLibrarian(Librarian ketabdar){
         //TODO
+        if (!doesLibrarianExist(ketabdar))
+        {
+            librarians.add(ketabdar);
+        }
+
     }
 
-    public void removeLibrarian(){
+    public void removeLibrarian(Librarian ketabdar){
         //TODO
+        if (doesLibrarianExist(ketabdar))
+        {
+            for (int i=0; i<librarians.size(); i++)
+            {
+                if (ketabdar.getUsername().equals(librarians.get(i).getUsername()))
+                {
+                    librarians.remove(i);
+                    break;
+                }
+            }
+        }
     }
 
-    public void searchLibrarian(){
+    public void searchLibrarian(Librarian ketabdar){
         //TODO
+        if (doesLibrarianExist(ketabdar))
+        {
+            System.out.println(ketabdar);
+        }
+        else
+        {
+            System.out.println("This librarian does not exist!");
+        }
     }
 
-    public void updateLibrarian(){
+    public void updateLibrarian(Librarian ketabdar){
         //TODO
+        if (doesLibrarianExist(ketabdar))
+        {
+            ketabdar.changePassword();
+        }
+        else
+        {
+            System.out.println("This librarian does not exist!");
+        }
     }
 
-    public void doesLibrarianExist(){
+    public Boolean doesLibrarianExist(Librarian ketabdar){
         //TODO
+        Boolean existence = false;
+        for (int i=0; i<librarians.size(); i++)
+        {
+            if (ketabdar.getUsername().equals(librarians.get(i).getUsername()))
+            {
+                existence = true;
+                break;
+            }
+        }
+        return existence;
+    }
+    public Boolean librarianPasswordCheck(Librarian ketabdar)
+    {
+        Boolean passCheck = false;
+        for (int i=0; i<librarians.size(); i++)
+        {
+            if (ketabdar.getUsername().equals(librarians.get(i).getUsername()))
+            {
+                if (ketabdar.getPassword().equals(librarians.get(i).getPassword()))
+                {
+                    passCheck = true;
+                    break;
+                }
+                else
+                {
+                    passCheck = false;
+                    break;
+                }
+            }
+        }
+        return passCheck;
     }
-
 
 }
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 9a347d3..839960a 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -1,18 +1,396 @@
 import java.util.Scanner;
 
-public class Main {
+public class Main
+{
     /*
     * make a functional library app using oop
     * run the main program in Main.java and code the oop part in other classes
     * don't forget to add at least 1 librarian to the library to make it functionable.
     * *  *** don't limit yourself to our template ***
      */
+    static Scanner input = new Scanner(System.in);
+    public static void main(String[] args)
+    {
+        Book ketab = new Book();
+        Library ketabkhune = new Library();
+        User karbar = new User();
+        Librarian ketabdar = new Librarian();
+        runMenu(ketab , ketabkhune , karbar , ketabdar);
+    }
+
+    public static void runMenu(Book ketab, Library ketabkhune, User karbar, Librarian ketabdar)
+    {
+        //TODO:
 
-    public static void main(String[] args) {
+        //Scanner in = new Scanner(System.in);
 
+        System.out.println("Welcome to the library!");
+        System.out.println("1.Users");
+        System.out.println("2.Librarians");
+        System.out.println("Enter your command");
+        System.out.println("command : ");
+        int command = Integer.parseInt(input.nextLine());
+        if (command == 1)
+        {
+            System.out.println("1.Sign Up");
+            System.out.println("2.Sign In");
+            System.out.println("Enter your command");
+            System.out.println("command : ");
+            command = Integer.parseInt(input.nextLine());
+            if (command == 1)
+            {
+                signUpUser(ketabkhune , ketabdar , karbar , ketab);
+            }
+            else
+            {
+                signInUser(ketabkhune , ketabdar , karbar , ketab);
+            }
+            userMenu(ketabkhune, karbar, ketab , ketabdar);
+        }
+        else
+        {
+            System.out.println("1.Sign Up");
+            System.out.println("2.Sign In");
+            System.out.println("Enter your command");
+            command = Integer.parseInt(input.nextLine());
+            if (command == 1)
+            {
+               signUpLibrarian(ketabkhune , ketabdar , karbar , ketab);
+            }
+            else
+            {
+               signInLibrarian(ketabkhune , ketabdar , karbar , ketab);
+            }
+            librarianMenu(ketabkhune, karbar, ketab, ketabdar);
+        }
     }
 
-    public static void runMenu(){
-        //TODO:
+    public static void signUpUser(Library ketabkhune , Librarian ketabdar , User karbar , Book ketab)
+    {
+        // input = new Scanner(System.in);
+        System.out.println("Enter your username");
+        System.out.println("Username : ");
+        String username = input.nextLine();
+        karbar.setUsername(username);
+        if (ketabkhune.doesUserExist(karbar))
+        {
+            System.out.println("You have already signed up!");
+            System.out.println("Enter your password to sign in");
+            System.out.println("Password : ");
+            String password = input.nextLine();
+            karbar.setPassword(password);
+            if (ketabkhune.userPasswordCheck(karbar))
+            {
+                System.out.println("Welcome!");
+            }
+            else
+            {
+                System.out.println("Wrong password!");
+                runMenu(ketab , ketabkhune , karbar , ketabdar);
+            }
+        }
+        else
+        {
+            System.out.println("Enter your password");
+            System.out.println("Password : ");
+            String password = input.nextLine();
+            karbar.setPassword(password);
+            ketabkhune.addUser(karbar);
+        }
+    }
+
+    public static void signInUser(Library ketabkhune , Librarian ketabdar , User karbar , Book ketab)
+    {
+        //Scanner input = new Scanner(System.in);
+        System.out.println("Enter your username");
+        System.out.println("Username : ");
+        String username = input.nextLine();
+        karbar.setUsername(username);
+        if (ketabkhune.doesUserExist(karbar))
+        {
+            System.out.println("Enter your password");
+            System.out.println("Password : ");
+            String password = input.nextLine();
+            if (ketabkhune.userPasswordCheck(karbar))
+            {
+                System.out.println("Welcome!");
+            }
+            else
+            {
+                System.out.println("Wrong password!");
+                runMenu(ketab , ketabkhune , karbar , ketabdar);
+            }
+        }
+        else
+        {
+            System.out.println("You do not have an account!");
+            System.out.println("You have to sign up!");
+            runMenu(ketab , ketabkhune , karbar , ketabdar);
+        }
+    }
+
+    public static void signUpLibrarian(Library ketabkhune , Librarian ketabdar , User karbar , Book ketab)
+    {
+        //Scanner input = new Scanner(System.in);
+        System.out.println("Enter your username");
+        System.out.println("Username : ");
+        String username = input.nextLine();
+        ketabdar.setUsername(username);
+        if (ketabkhune.doesLibrarianExist(ketabdar))
+        {
+            System.out.println("You have already signed up!");
+            System.out.println("Enter your password to sign in");
+            System.out.println("Password : ");
+            String password = input.nextLine();
+            ketabdar.setPassword(password);
+            if (ketabkhune.librarianPasswordCheck(ketabdar))
+            {
+                System.out.println("Welcome!");
+            }
+            else
+            {
+                System.out.println("Wrong password!");
+                runMenu(ketab , ketabkhune , karbar , ketabdar);
+            }
+        }
+        else
+        {
+            System.out.println("Enter your password");
+            System.out.println("Password : ");
+            String password = input.nextLine();
+            ketabdar.setPassword(password);
+            ketabkhune.addLibrarian(ketabdar);
+        }
+    }
+
+    public static void  signInLibrarian(Library ketabkhune , Librarian ketabdar , User karbar , Book ketab)
+    {
+        //Scanner input = new Scanner(System.in);
+        System.out.println("Enter your username");
+        System.out.println("Username : ");
+        String username = input.nextLine();
+        karbar.setUsername(username);
+        if (ketabkhune.doesLibrarianExist(ketabdar))
+        {
+            System.out.println("Enter your password");
+            System.out.println("Password : ");
+            String password = input.nextLine();
+            if (ketabkhune.librarianPasswordCheck(ketabdar))
+            {
+                System.out.println("Welcome!");
+            }
+            else
+            {
+                System.out.println("Wrong password!");
+                runMenu(ketab , ketabkhune , karbar , ketabdar);
+            }
+        }
+        else
+        {
+            System.out.println("You do not have an account!");
+            System.out.println("You have to sign up!");
+            runMenu(ketab , ketabkhune , karbar , ketabdar);
+        }
+    }
+
+    public static void borrowBook(Library ketabkhune , User karbar , Book ketab)
+    {
+        //Scanner input = new Scanner(System.in);
+        System.out.println("Enter the book's name ");
+        System.out.println("Name : ");
+        String name = input.nextLine();
+        ketab.setName(name);
+        System.out.println("Enter the author's name");
+        System.out.println("Author : ");
+        String author = input.nextLine();
+        ketab.setAuthor(author);
+        if (ketabkhune.searchBook(ketab).equals(""))
+        {
+            System.out.println("The library does not have this book or it is not available!");
+        }
+        else
+        {
+            String ISBN = ketabkhune.searchBook(ketab);
+            ketab.setISBN(ISBN);
+            karbar.rentBook(ketabkhune , ketab);
+        }
+    }
+
+    public static void returnBook(Library ketabkhune , User karbar , Book ketab)
+    {
+        //Scanner input = new Scanner(System.in);
+        System.out.println("Enter the book's name ");
+        System.out.println("Name : ");
+        String name = input.nextLine();
+        ketab.setName(name);
+        System.out.println("Enter the author's name");
+        System.out.println("Author : ");
+        String author = input.nextLine();
+        ketab.setAuthor(author);
+        if (karbar.searchRentBook(ketab).equals(""))
+        {
+            System.out.println("You do not have this book!");
+        }
+        else
+        {
+            String ISBN = karbar.searchRentBook(ketab);
+            ketab.setISBN(ISBN);
+            karbar.returnBook(ketabkhune , ketab);
+        }
+    }
+
+    public static void logOut(Book ketab , Library ketabkhune , User karbar , Librarian ketabdar)
+    {
+        System.out.println("You have logged out!");
+        runMenu(ketab , ketabkhune , karbar , ketabdar);
+    }
+
+    public static void userMenu(Library ketabkhune, User karbar, Book ketab , Librarian ketabdar)
+    {
+        //Scanner input = new Scanner(System.in);
+        System.out.println("1.Borrow book");
+        System.out.println("2.Return book");
+        System.out.println("3.Update User");
+        System.out.println("4.Log out");
+        System.out.println("Enter your command");
+        System.out.println("command : ");
+        int command = Integer.parseInt(input.nextLine());
+        if (command == 1)
+        {
+            borrowBook(ketabkhune, karbar, ketab);
+            userMenu(ketabkhune, karbar, ketab , ketabdar);
+        }
+        else if (command == 2)
+        {
+            returnBook(ketabkhune, karbar, ketab);
+            userMenu(ketabkhune, karbar, ketab, ketabdar);
+        }
+        else  if (command == 3)
+        {
+            ketabkhune.updateUser(karbar);
+            userMenu(ketabkhune, karbar, ketab, ketabdar);
+
+        }
+        else if (command == 4)
+        {
+            logOut(ketab , ketabkhune , karbar , ketabdar);
+        }
+    }
+
+    public static void librarianMenu(Library ketabkhune, User karbar, Book ketab, Librarian ketabdar)
+    {
+        //Scanner input = new Scanner(System.in);
+        // Books
+        System.out.println("1.Add book");
+        System.out.println("2.Remove book");
+        System.out.println("3.Search book");
+        // Users
+        String usersUsername;
+        String usersPassword;
+        System.out.println("4.Add user");
+        System.out.println("5.Remove user");
+        System.out.println("6.Search user");
+        System.out.println("7.Update user");
+        // Librarian
+        System.out.println("8.Update librarian");
+        System.out.println("9.Search librarian");
+        System.out.println("10.Log out");
+        System.out.println("Enter your command");
+        System.out.println("command : ");
+        int command = Integer.parseInt(input.nextLine());
+        if (command == 1) {
+            System.out.println("Enter book's name");
+            System.out.println("Name : ");
+            String name = input.nextLine();
+            ketab.setName(name);
+            System.out.println("Enter author's name");
+            System.out.println("Author : ");
+            String author = input.nextLine();
+            ketab.setAuthor(author);
+            System.out.println("Enter the year of publish");
+            System.out.println("Year of publish : ");
+            int yearOfPublish = Integer.parseInt(input.nextLine());
+            ketab.setYearOfPublish(yearOfPublish);
+            System.out.println("Enter the book's ISBN");
+            System.out.println("ISBN : ");
+            String ISBN = input.nextLine();
+            ketab.setISBN(ISBN);
+            ketabkhune.addBook(ketab);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 2) {
+            System.out.println("Enter the book's ISBN");
+            System.out.println("ISBN : ");
+            String removeISBN = input.nextLine();
+            ketab.setISBN(removeISBN);
+            ketabkhune.removeBook(ketab);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 3) {
+            if (ketabkhune.doesBookExist(ketab)) {
+                System.out.println(ketab);
+            } else {
+                System.out.println("This book does not exist!");
+            }
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 4) {
+            System.out.println("Enter the user's username");
+            System.out.println("Username : ");
+            usersUsername = input.nextLine();
+            karbar.setUsername(usersUsername);
+            System.out.println("Enter user's password");
+            System.out.println("Password : ");
+            usersPassword = input.nextLine();
+            karbar.setPassword(usersPassword);
+            ketabkhune.addUser(karbar);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 5) {
+            System.out.println("Enter the user's username");
+            System.out.println("Username : ");
+            usersUsername = input.nextLine();
+            karbar.setUsername(usersUsername);
+            if (ketabkhune.doesUserExist(karbar))
+            {
+                ketabkhune.removeUser(karbar);
+                System.out.println("The user is removed");
+            }
+            else
+            {
+                System.out.println("The user does not exist!");
+            }
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 6) {
+            System.out.println("Enter the user's username");
+            System.out.println("Username : ");
+            usersUsername = input.nextLine();
+            karbar.setUsername(usersUsername);
+            ketabkhune.searchUser(karbar);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 7) {
+            System.out.println("Enter the user's username");
+            System.out.println("Username : ");
+            usersUsername = input.nextLine();
+            karbar.setUsername(usersUsername);
+            ketabkhune.updateUser(karbar);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 8) {
+            ketabkhune.updateLibrarian(ketabdar);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 9) {
+            ketabkhune.searchLibrarian(ketabdar);
+            librarianMenu(ketabkhune , karbar , ketab , ketabdar);
+        }
+        else if (command == 10) {
+            logOut(ketab , ketabkhune , karbar , ketabdar);
+        }
+
     }
 }
+
+
diff --git a/src/main/java/User.java b/src/main/java/User.java
index dbe4020..2d29fcb 100644
--- a/src/main/java/User.java
+++ b/src/main/java/User.java
@@ -1,12 +1,105 @@
+import java.awt.*;
+import java.util.Scanner;
+import java.util.ArrayList;
+
 public class User {
     //User should have a list of books
     //User should have a username and a password
 
-    public void rentBook(){
+    Scanner input = new Scanner(System.in);
+
+    private String username;
+    private String password;
+
+    /* public User(String username, String password)
+    {
+        this.username = username;
+        this.password = password;
+    }*/
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void changePassword(){
+        System.out.println("Enter your currenct password :");
+        String currentPassword = input.nextLine();
+        if (currentPassword.equals(getPassword()))
+        {
+            System.out.println("Enter your new password :");
+            String newPassword = input.nextLine();
+            this.password = newPassword;
+        }
+        else
+        {
+            System.out.println("Wrong password!");
+            changePassword();
+        }
+    }
+
+    ArrayList<Book> rentBooks = new ArrayList<>();
+
+    public void rentBook(Library ketabkhune , Book ketab){
         //TODO
+        if (ketabkhune.doesBookExist(ketab))
+        {
+            if (ketab.getAvailable())
+            {
+                rentBooks.add(ketab);
+                ketabkhune.updateBook(ketab);
+                ketabkhune.decreaseBook(ketab);
+            }
+            else
+            {
+                System.out.println("This book is not available!");
+            }
+        }
+        else
+        {
+            System.out.println("This book does not exist!");
+        }
+    }
+    public String searchRentBook(Book ketab){
+        //TODO
+        for (int i=0; i<rentBooks.size(); i++)
+        {
+            if (ketab.getName().equals(rentBooks.get(i).getName()) && ketab.getAuthor().equals(rentBooks.get(i).getAuthor()))
+            {
+                return ketab.getISBN();
+            }
+        }
+        return "";
     }
 
-    public void returnBook(){
+    public void returnBook(Library ketabkhune , Book ketab){
         //TODO
+        for (int i=0; i<rentBooks.size(); i++)
+        {
+            if (ketab.getISBN().equals(rentBooks.get(i).getISBN()))
+            {
+                rentBooks.remove(i);
+                break;
+            }
+        }
+        ketabkhune.updateBook(ketab);
+        ketabkhune.increaseBook(ketab);
+    }
+
+    public String toString()
+    {
+        return "User's username: " + username + " " +
+            "User's password: " + password;
     }
 }