diff --git a/src/main/java/com/booleanuk/core/Article.java b/src/main/java/com/booleanuk/core/Article.java
index 1e359b0..aa0976c 100644
--- a/src/main/java/com/booleanuk/core/Article.java
+++ b/src/main/java/com/booleanuk/core/Article.java
@@ -1,35 +1,15 @@
 package com.booleanuk.core;
 
-public class Article {
-    String title;
+public class Article extends Item{
+    private Author author;
 
-    boolean onLoan = false;
-
-    public Article(String title) {
-        this.title = title;
-    }
-
-    public boolean isOnLoan() {
-        return onLoan;
+    public Article(String title, Author author) {
+        super(title);
+        this.author = author;
     }
 
-    public String checkIn() {
-        if (!this.isOnLoan()) {
-            return "item is not currently on loan";
-        }
-
-        this.onLoan = false;
-
-        return "item has been checked in";
+    public Author getAuthor() {
+        return this.author;
     }
 
-    public String checkOut() {
-        if (this.isOnLoan()) {
-            return "item is currently on loan";
-        }
-
-        this.onLoan = true;
-
-        return "item has been checked out";
-    }
 }
diff --git a/src/main/java/com/booleanuk/core/Author.java b/src/main/java/com/booleanuk/core/Author.java
new file mode 100644
index 0000000..65269bd
--- /dev/null
+++ b/src/main/java/com/booleanuk/core/Author.java
@@ -0,0 +1,33 @@
+package com.booleanuk.core;
+
+public class Author {
+    private String name;
+    private String contactInformation;
+    private String website;
+
+    public Author(String name, String contactInformation, String website) {
+        this.name = name;
+        setContactInformation(contactInformation);
+        setWebsite(website);
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getContactInformation() {
+        return this.contactInformation;
+    }
+
+    public String getWebsite() {
+        return this.website;
+    }
+
+    public void setContactInformation(String contactInformation) {
+        this.contactInformation = contactInformation;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+}
diff --git a/src/main/java/com/booleanuk/core/Book.java b/src/main/java/com/booleanuk/core/Book.java
index 9261f65..eb7d1ba 100644
--- a/src/main/java/com/booleanuk/core/Book.java
+++ b/src/main/java/com/booleanuk/core/Book.java
@@ -1,35 +1,14 @@
 package com.booleanuk.core;
 
-public class Book {
-    String title;
+public class Book extends Item{
+    private Author author;
 
-    boolean onLoan = false;
-
-    public Book(String title) {
-        this.title = title;
-    }
-
-    public boolean isOnLoan() {
-        return onLoan;
+    public Book(String title, Author author) {
+        super(title);
+        this.author = author;
     }
 
-    public String checkIn() {
-        if (!this.isOnLoan()) {
-            return "item is not currently on loan";
-        }
-
-        this.onLoan = false;
-
-        return "item has been checked in";
-    }
-
-    public String checkOut() {
-        if (this.isOnLoan()) {
-            return "item is currently on loan";
-        }
-
-        this.onLoan = true;
-
-        return "item has been checked out";
+    public Author getAuthor() {
+        return this.author;
     }
 }
diff --git a/src/main/java/com/booleanuk/core/Item.java b/src/main/java/com/booleanuk/core/Item.java
new file mode 100644
index 0000000..b2a2636
--- /dev/null
+++ b/src/main/java/com/booleanuk/core/Item.java
@@ -0,0 +1,35 @@
+package com.booleanuk.core;
+
+public class Item {
+    String title;
+
+    boolean onLoan = false;
+
+    public Item(String title) {
+        this.title = title;
+    }
+
+    public boolean isOnLoan() {
+        return onLoan;
+    }
+
+    public String checkIn() {
+        if (!this.isOnLoan()) {
+            return "item is not currently on loan";
+        }
+
+        this.onLoan = false;
+
+        return "item has been checked in";
+    }
+
+    public String checkOut() {
+        if (this.isOnLoan()) {
+            return "item is currently on loan";
+        }
+
+        this.onLoan = true;
+
+        return "item has been checked out";
+    }
+}
diff --git a/src/main/java/com/booleanuk/core/Library.java b/src/main/java/com/booleanuk/core/Library.java
index f03ecf0..ead5851 100644
--- a/src/main/java/com/booleanuk/core/Library.java
+++ b/src/main/java/com/booleanuk/core/Library.java
@@ -1,95 +1,43 @@
 package com.booleanuk.core;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class Library {
-    List<Article> articles;
-    List<Book> books;
-    List<Newspaper> newspapers;
+    List<Item> items;
 
-    public void addToStock(Article item) {
-        this.articles.add(item);
+    public Library() {
+        this.items = new ArrayList<>();
     }
 
-    public void addToStock(Book item) {
-        this.books.add(item);
-    }
-
-    public void addToStock(Newspaper item) {
-        this.newspapers.add(item);
+    public void addToStock(Item item) {
+        this.items.add(item);
     }
 
     // The following methods may contain code that you are unfamiliar with. The strange syntax of article -> something
     // is called a lambda expression (https://www.w3schools.com/java/java_lambda.asp)
-    public String checkInArticle(String title) {
-        List<Article> filtered = this.articles.stream()
-                .filter(article -> article.title.equals(title))
+    public String checkInItem(String title) {
+        List<Item> filtered = this.items.stream()
+                .filter(item -> item.title.equals(title))
                 .toList();
 
-        if (filtered.size() < 1) {
+        if (filtered.isEmpty()) {
             return "item is not part of the library's collection";
         }
 
         return filtered.get(0).checkIn();
     }
 
-    public String checkOutArticle(String title) {
-        List<Article> filtered = this.articles.stream()
-                .filter(article -> article.title.equals(title))
+    public String checkOutItem(String title) {
+        List<Item> filtered = this.items.stream()
+                .filter(item -> item.title.equals(title))
                 .toList();
 
-        if (filtered.size() < 1) {
+        if (filtered.isEmpty()) {
             return "item is not part of the library's collection";
         }
 
         return filtered.get(0).checkOut();
     }
 
-    public String checkInBook(String title) {
-        List<Book> filtered = this.books.stream()
-                .filter(book -> book.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
-
-        return filtered.get(0).checkIn();
-    }
-
-    public String checkOutBook(String title) {
-        List<Book> filtered = this.books.stream()
-                .filter(book -> book.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
-
-        return filtered.get(0).checkOut();
-    }
-
-    public String checkInNewspaper(String title) {
-        List<Newspaper> filtered = this.newspapers.stream()
-                .filter(newspaper -> newspaper.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
-
-        return filtered.get(0).checkIn();
-    }
-
-    public String checkOutNewspaper(String title) {
-        List<Newspaper> filtered = this.newspapers.stream()
-                .filter(newspaper -> newspaper.title.equals(title))
-                .toList();
-
-        if (filtered.size() < 1) {
-            return "item is not part of the library's collection";
-        }
-
-        return filtered.get(0).checkOut();
-    }
 }
diff --git a/src/main/java/com/booleanuk/core/Newspaper.java b/src/main/java/com/booleanuk/core/Newspaper.java
index 8411d9c..466e8fa 100644
--- a/src/main/java/com/booleanuk/core/Newspaper.java
+++ b/src/main/java/com/booleanuk/core/Newspaper.java
@@ -1,22 +1,17 @@
 package com.booleanuk.core;
 
-public class Newspaper {
-    String title;
-
-    boolean onLoan = false;
+public class Newspaper extends Item{
 
     public Newspaper(String title) {
-        this.title = title;
-    }
-
-    public boolean isOnLoan() {
-        return onLoan;
+        super(title);
     }
 
+    @Override
     public String checkIn() {
         return "newspapers are not available for loan";
     }
 
+    @Override
     public String checkOut() {
         return "newspapers are not available for loan";
     }
diff --git a/src/test/java/com/booleanuk/core/ArticleTest.java b/src/test/java/com/booleanuk/core/ArticleTest.java
index 00bbaeb..dcad540 100644
--- a/src/test/java/com/booleanuk/core/ArticleTest.java
+++ b/src/test/java/com/booleanuk/core/ArticleTest.java
@@ -4,32 +4,42 @@
 import org.junit.jupiter.api.Test;
 
 class ArticleTest {
+    Author author = new Author("Marit", "marit@someEmail.com", "marit.someWebsite.com");
+
     @Test
     public void shouldCheckOutIfAvailable() {
-        Article article = new Article("JUnit Rocks");
-        Assertions.assertEquals("item has been checked out", article.checkOut());
+        Item item = new Article("JUnit Rocks", author);
+        Assertions.assertEquals("item has been checked out", item.checkOut());
     }
 
     @Test
     public void shouldDeclineIfNotAvailableToCheckout() {
-        Article article = new Article("JUnit Rocks");
-        article.checkOut();
+        Item item = new Article("JUnit Rocks", author);
+        item.checkOut();
 
-        Assertions.assertEquals("item is currently on loan", article.checkOut());
+        Assertions.assertEquals("item is currently on loan", item.checkOut());
     }
 
     @Test
     public void shouldCheckInIfOnLoan() {
-        Article article = new Article("JUnit Rocks");
-        article.checkOut();
+        Item item = new Article("JUnit Rocks", author);
+        item.checkOut();
 
-        Assertions.assertEquals("item has been checked in", article.checkIn());
+        Assertions.assertEquals("item has been checked in", item.checkIn());
     }
 
     @Test
     public void shouldDeclineCheckInIfNotOnLoan() {
-        Article article = new Article("JUnit Rocks");
+        Item item = new Article("JUnit Rocks", author);
+
+        Assertions.assertEquals("item is not currently on loan", item.checkIn());
+    }
 
-        Assertions.assertEquals("item is not currently on loan", article.checkIn());
+    @Test
+    public void shouldGetAuthorInformation() {
+        Article article = new Article("JUnit Rocks", author);
+        Assertions.assertEquals("Marit", article.getAuthor().getName());
+        Assertions.assertEquals("marit@someEmail.com", article.getAuthor().getContactInformation());
+        Assertions.assertEquals("marit.someWebsite.com", article.getAuthor().getWebsite());
     }
 }
diff --git a/src/test/java/com/booleanuk/core/BookTest.java b/src/test/java/com/booleanuk/core/BookTest.java
index 180a165..2ceaff6 100644
--- a/src/test/java/com/booleanuk/core/BookTest.java
+++ b/src/test/java/com/booleanuk/core/BookTest.java
@@ -4,32 +4,42 @@
 import org.junit.jupiter.api.Test;
 
 public class BookTest {
+    Author author = new Author("Marit", "marit@someEmail.com", "marit.someWebsite.com");
+
     @Test
     public void shouldCheckOutIfAvailable() {
-        Book book = new Book("JUnit Rocks");
-        Assertions.assertEquals("item has been checked out", book.checkOut());
+        Item item = new Book("JUnit Rocks", author);
+        Assertions.assertEquals("item has been checked out", item.checkOut());
     }
 
     @Test
     public void shouldDeclineIfNotAvailableToCheckout() {
-        Book book = new Book("JUnit Rocks");
-        book.checkOut();
+        Item item = new Book("JUnit Rocks", author);
+        item.checkOut();
 
-        Assertions.assertEquals("item is currently on loan", book.checkOut());
+        Assertions.assertEquals("item is currently on loan", item.checkOut());
     }
 
     @Test
     public void shouldCheckInIfOnLoan() {
-        Book book = new Book("JUnit Rocks");
-        book.checkOut();
+        Item item = new Book("JUnit Rocks", author);
+        item.checkOut();
 
-        Assertions.assertEquals("item has been checked in", book.checkIn());
+        Assertions.assertEquals("item has been checked in", item.checkIn());
     }
 
     @Test
     public void shouldDeclineCheckInIfNotOnLoan() {
-        Book book = new Book("JUnit Rocks");
+        Item item = new Book("JUnit Rocks", author);
+
+        Assertions.assertEquals("item is not currently on loan", item.checkIn());
+    }
 
-        Assertions.assertEquals("item is not currently on loan", book.checkIn());
+    @Test
+    public void shouldGetAuthorInformation() {
+        Book book = new Book("JUnit Rocks", author);
+        Assertions.assertEquals("Marit", book.getAuthor().getName());
+        Assertions.assertEquals("marit@someEmail.com", book.getAuthor().getContactInformation());
+        Assertions.assertEquals("marit.someWebsite.com", book.getAuthor().getWebsite());
     }
 }
diff --git a/src/test/java/com/booleanuk/core/ItemTest.java b/src/test/java/com/booleanuk/core/ItemTest.java
new file mode 100644
index 0000000..8a85852
--- /dev/null
+++ b/src/test/java/com/booleanuk/core/ItemTest.java
@@ -0,0 +1,35 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ItemTest {
+    @Test
+    public void shouldCheckOutIfAvailable() {
+        Item item = new Item("JUnit Rocks");
+        Assertions.assertEquals("item has been checked out", item.checkOut());
+    }
+
+    @Test
+    public void shouldDeclineIfNotAvailableToCheckout() {
+        Item item = new Item("JUnit Rocks");
+        item.checkOut();
+
+        Assertions.assertEquals("item is currently on loan", item.checkOut());
+    }
+
+    @Test
+    public void shouldCheckInIfOnLoan() {
+        Item item = new Item("JUnit Rocks");
+        item.checkOut();
+
+        Assertions.assertEquals("item has been checked in", item.checkIn());
+    }
+
+    @Test
+    public void shouldDeclineCheckInIfNotOnLoan() {
+        Item item = new Item("JUnit Rocks");
+
+        Assertions.assertEquals("item is not currently on loan", item.checkIn());
+    }
+}
diff --git a/src/test/java/com/booleanuk/core/LibraryTest.java b/src/test/java/com/booleanuk/core/LibraryTest.java
new file mode 100644
index 0000000..1066164
--- /dev/null
+++ b/src/test/java/com/booleanuk/core/LibraryTest.java
@@ -0,0 +1,112 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class LibraryTest {
+    Author author = new Author("Marit", "marit@someEmail.com", "marit.someWebsite.com");
+
+    @Test
+    public void shouldAddToStock() {
+        Library library = new Library();
+        Item item = new Item("JUnit Rocks");
+        library.addToStock(item);
+
+        Assertions.assertTrue(library.items.contains(item));
+        Assertions.assertEquals(1, library.items.size());
+    }
+
+    @Test
+    public void multipleItemsShouldAddToStock() {
+        Library library = new Library();
+        Item item = new Item("JUnit Rocks");
+        Item article = new Article("Java Rocks", author);
+        Item book = new Book("Java for Beginners", author);
+        Item newspaper = new Newspaper("Java Newspaper");
+        library.addToStock(item);
+        library.addToStock(article);
+        library.addToStock(book);
+        library.addToStock(newspaper);
+
+        Assertions.assertEquals(4, library.items.size());
+    }
+
+    @Test
+    public void shouldCheckOutIfAvailable() {
+        Library library = new Library();
+        Item article = new Article("Java Rocks", author);
+        Item book = new Book("Java for Beginners", author);
+        Item newspaper = new Newspaper("Java Newspaper");
+        library.addToStock(article);
+        library.addToStock(book);
+        library.addToStock(newspaper);
+
+        Assertions.assertEquals("item has been checked out", library.checkOutItem("Java Rocks"));
+        Assertions.assertEquals("item has been checked out", library.checkOutItem("Java for Beginners"));
+        Assertions.assertEquals("newspapers are not available for loan", library.checkOutItem("Java Newspaper"));
+    }
+
+    @Test
+    public void shouldDeclineIfNotAvailableToCheckout() {
+        Library library = new Library();
+        Item article = new Article("Java Rocks", author);
+        Item book = new Book("Java for Beginners", author);
+        library.addToStock(article);
+        library.addToStock(book);
+        article.checkOut();
+        book.checkOut();
+
+        Assertions.assertEquals("item is currently on loan", library.checkOutItem("Java Rocks"));
+        Assertions.assertEquals("item is currently on loan", library.checkOutItem("Java for Beginners"));
+    }
+
+    @Test
+    public void shouldDeclineCheckoutIfNotPartOfLibraryCollection() {
+        Library library = new Library();
+
+        Assertions.assertEquals("item is not part of the library's collection", library.checkOutItem("Java Rocks"));
+        Assertions.assertEquals("item is not part of the library's collection", library.checkOutItem("Java for Beginners"));
+        Assertions.assertEquals("item is not part of the library's collection", library.checkOutItem("Java Newspaper"));
+    }
+
+    @Test
+    public void shouldCheckInIfOnLoan() {
+        Library library = new Library();
+        Item article = new Article("Java Rocks", author);
+        Item book = new Book("Java for Beginners", author);
+        Item newspaper = new Newspaper("Java Newspaper");
+        library.addToStock(article);
+        library.addToStock(book);
+        library.addToStock(newspaper);
+        article.checkOut();
+        book.checkOut();
+
+        Assertions.assertEquals("item has been checked in", library.checkInItem("Java Rocks"));
+        Assertions.assertEquals("item has been checked in", library.checkInItem("Java for Beginners"));
+        Assertions.assertEquals("newspapers are not available for loan", library.checkInItem("Java Newspaper"));
+    }
+
+    @Test
+    public void shouldDeclineCheckInIfNotOnLoan() {
+        Library library = new Library();
+        Item article = new Article("Java Rocks", author);
+        Item book = new Book("Java for Beginners", author);
+        library.addToStock(article);
+        library.addToStock(book);
+
+        Assertions.assertEquals("item is not currently on loan", library.checkInItem("Java Rocks"));
+        Assertions.assertEquals("item is not currently on loan", library.checkInItem("Java for Beginners"));
+    }
+
+    @Test
+    public void shouldDeclineCheckInIfNotPartOfLibraryCollection() {
+        Library library = new Library();
+        Item article = new Article("Java Rocks", author);
+        Item book = new Book("Java for Beginners", author);
+        Item newspaper = new Newspaper("Java Newspaper");
+
+        Assertions.assertEquals("item is not part of the library's collection", library.checkInItem(article.title));
+        Assertions.assertEquals("item is not part of the library's collection", library.checkInItem(book.title));
+        Assertions.assertEquals("item is not part of the library's collection", library.checkInItem(newspaper.title));
+    }
+}
diff --git a/src/test/java/com/booleanuk/core/NewspaperTest.java b/src/test/java/com/booleanuk/core/NewspaperTest.java
index 38195af..fab47b9 100644
--- a/src/test/java/com/booleanuk/core/NewspaperTest.java
+++ b/src/test/java/com/booleanuk/core/NewspaperTest.java
@@ -6,13 +6,13 @@
 public class NewspaperTest {
     @Test
     public void shouldBeUnavailableForCheckIn() {
-        Newspaper newspaper = new Newspaper("The Daily Java");
-        Assertions.assertEquals("newspapers are not available for loan", newspaper.checkIn());
+        Item item = new Newspaper("The Daily Java");
+        Assertions.assertEquals("newspapers are not available for loan", item.checkIn());
     }
 
     @Test
     public void shouldBeUnavailableForCheckOut() {
-        Newspaper newspaper = new Newspaper("The Daily Java");
-        Assertions.assertEquals("newspapers are not available for loan", newspaper.checkOut());
+        Item item = new Newspaper("The Daily Java");
+        Assertions.assertEquals("newspapers are not available for loan", item.checkOut());
     }
 }