diff --git a/README.md b/README.md
index 5c068c96..4facf1a3 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,10 @@ deflated prices and a lot more!
       - [Add untracked trades easily](#add-untracked-trades-easily)
       - [Setup offers quickly](#offer-editors)
       - [Favorites lookup](#favorites-lookup)
+- [Development](#development)
+    + [General Structure of Codebase](#general-structure-of-codebase)
+    + [Example Flow](#example-flow)
+
     
 # Features
 The plugin is divided into three tabs: the slots tab, flipping tab and statistics tab. 
@@ -122,6 +126,108 @@ Quickly lookup your favorited items just by typing "1" in the ge search!
   <img src = "https://github.com/Flipping-Utilities/rl-plugin/blob/master/images/lookup.png">
 </p>
 
+# Development 
+
+### General Structure of Codebase
+
+This section will talk about the purpose of various parts of the codebase, specifically the folders.
+
+**controller/**
+- This folder contains the components that handle some specific responsibility of the plugin, mainly by handling runelite 
+  events (such as new GE offers) or presenting APIs to alter/view user data. Each class in this folder is instantiated 
+  by the FlippingPlugin in its constructor, which is run on client startup. Each of these classes handles a specific 
+  responsibility of the plugin. For example, the NewOfferEventPipelineHandler is responsible for consuming new offer 
+  events and adding it to the data structures that model user trade history. The classes are used via the FlippingPlugin 
+  calling their methods, for example, when the FlippingPlugin gets an offer event in the onGrandExchangeOfferChanged 
+  method it calls `newOfferEventPipelineHandler.onGrandExchangeOfferChanged(newOffer);`.
+  Much of the logic in these controller classes used to live in the FlippingPlugin class but was moved out as the 
+  FlippingPlugin class had become huge and was doing too many things.
+  
+  
+**model/**
+- This folder contains the classes that represent the data that will be stored on disk. These classes are turned into 
+  JSON and saved to disk and are also created from JSON that was previously saved to disk. To see what each of these
+  classes actually model, check out the [Data model](#Data-model) section.
+  
+  
+**db/**
+- This folder contains the class responsible for taking the models and saving them
+to disk as JSON. It also loads JSON from disk (previously saved) and turns them into objects.
+  
+**ui/**
+- This folder contains all of the UI code for the plugin which is the code that draws the "plugin" you see, such as the slots 
+tab, the flipping tab, the statistics tab, and all of the content within them. 
+  
+**jobs/**
+- This folder contains code that is running in background threads to periodically performing some action, such as the 
+  code that queries the wiki to get the new prices of items, or the code that sends premium users' slots to our api.
+  
+**utilities/**
+- Just random code that doesn't fit neatly into any of the categories above. 
+
+### Example Flow
+
+This section will give an example of how the plugin actually runs, what happens during its lifetime, how the different 
+components interact with each other, and how the data flows.
+
+The starting point to this plugin is the FlippingPlugin class. On Runelite startup, the Runelite code will create an 
+instance of the FlippingPlugin class and then call its `startUp()` method.
+
+#### On Runelite Client Startup
+The FlippingPlugin does three main things on startup (all in the `startUp()` method):
+1. It creates instances of all the controller classes, described in the controller section of [General Structure of Codebase](#General-structure-of-codebase)
+2. It initializes the various UI classes such as the FlippingPanel and StatsPanel. This will result in the UI being
+drawn eventually.
+3. It loads the user's previously saved trading history from the disk via one of the controller classes, the DataHandler
+
+Now things have been setup properly and the UI has been drawn and populated with the user's previously saved data from
+disk.
+
+#### During Runelite Client's Lifetime
+During the lifetime of the Runelite Client (between startup and shutdown), there are primarily three ways the plugin does work
+1. **Handling Runelite events that reflect some change of state in the game**. There are many different Runelite events. For example, 
+   events can trigger in various scenarios: when an account logs in, a GE offer gets placed, an account logs out, 
+   an account opens the GE interace, and many more. The Runelite code will feed the plugin these events if the plugin implements certain methods. For example, 
+   when the user places an offer in the GE, Runelite code gives the plugin details of the GE offer event via calling the 
+   `onGrandExchangeOfferChanged` on the FlippingPlugin class and passing that method a `GrandExchangeOfferChanged` object.
+   It knows to do this because of method naming conventions. You don't have to define a method to handle every possible 
+   type of Runelite event, just the ones your plugin should care about.
+2. **Handling UI interactions that the user initiates**. For example, the user may want to see data for another account, so
+   he clicks on the account dropdown selector and selects another account. The plugin then needs to re-render its UI with the 
+   selected account's trades.
+3. **Via background threads that are performing some action periodically**. See the jobs section of [General Structure of Codebase](#general-structure-of-codebase).
+
+
+#### On Runelite Client Shutdown
+The runelite client will tell the plugin when its shutting down and will allow it to execute some code before
+that happens. This occurs in `onClientShutdown` in the FlippingPlugin class. Not much happens other than saving 
+user data to disk and cancelling any background jobs that were running.
+
+
+### Data model
+
+This section describes how the plugin models users' trade history. The main model classes used to do this are:
+AccountData, FlippingItem, HistoryManager, and OfferEvent.
+
+When you go to `.runelite/flipping/<username>.json` and open it, you will see the JSON version of an AccountData
+object. Each of the user's osrs accounts get their own AccountData object, each of which is stored in a file
+of the format `.runelite/flipping/<account_username>.json`. 
+
+AccountData objects are created from the JSON in those files on client startup (or created on account login if they have
+no previously saved data for that account). As the user makes trades, deletes trades via the UI, and so on, the 
+AccountData object for the correct account is mutated. Then, on account logout or client shutdown, it is turned back 
+into JSON and saved into the same file it was loaded from (or creates a new file if there was no previously saved data).
+
+The AccountData object's most important field is `List<FlippingItem> trades`. This field contains FlippingItem objects.
+FlippingItem objects have an itemId (every runescape item has a unique number to identify it) and represents the trade history
+for that item on that account. So, for example, if you flipped dragon claws on an account, you would have one and only one 
+FlippingItem in that account's AccountData object that holds all the buy and sell offers you have ever made for dragon 
+claws on that account. 
+
+The FlippingItem stores all the offers for that item in the `HistoryManager history` field. Put simply, a HistoryManager
+is just a list of OfferEvent. An OfferEvent represents a buy and sell offer in which some amount of an
+item bought or sold. It has various fields like price, quantity, etc.
+
 
 ## Icon Attributions
 All icons were either made by Belieal or downloaded from the creators on www.flaticon.com below.
diff --git a/build.gradle b/build.gradle
index 73e2c20f..3deace85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ repositories {
 	mavenCentral()
 }
 
-def runeLiteVersion = '1.8.32'
+def runeLiteVersion = '1.9.5'
 
 dependencies {
     compileOnly group: 'net.runelite', name:'client', version: runeLiteVersion
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf0..e708b1c0 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew b/gradlew
index 83f2acfd..4f906e0c 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a14..ac1b06f9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/images/list.png b/images/list.png
new file mode 100644
index 00000000..a4960a0d
Binary files /dev/null and b/images/list.png differ
diff --git a/src/main/java/com/flippingutilities/model/AccountWideData.java b/src/main/java/com/flippingutilities/model/AccountWideData.java
index 43dd53dd..24f6262e 100644
--- a/src/main/java/com/flippingutilities/model/AccountWideData.java
+++ b/src/main/java/com/flippingutilities/model/AccountWideData.java
@@ -3,14 +3,14 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 @Data
 @Slf4j
 public class AccountWideData {
     List<Option> options = new ArrayList<>();
     List<Section> sections = new ArrayList<>();
+    Map<String, Set<Integer>> favoriteItemLists = new HashMap<>();
     boolean shouldMakeNewAdditions = true;
     boolean enhancedSlots = true;
     String jwt;
@@ -37,6 +37,12 @@ public boolean setDefaults() {
             didChangeData = true;
             setDefaultFlippingItemPanelSections();
         }
+
+        if (favoriteItemLists.isEmpty()) {
+            didChangeData = true;
+            favoriteItemLists.put("DEFAULT", new HashSet<>());
+        }
+
         return didChangeData;
     }
 
@@ -92,4 +98,35 @@ private void setDefaultFlippingItemPanelSections() {
         sections.add(otherSection);
     }
 
+    public Set<Integer> getFavoriteListData(String listName) {
+        return favoriteItemLists.get(listName);
+    }
+
+    public Set<String> getAllListNames () {
+        return favoriteItemLists.keySet();
+    }
+
+    public boolean addNewFavoriteList (String listName){
+        if (!favoriteItemLists.containsKey(listName)){
+            favoriteItemLists.put(listName,new HashSet<>());
+            return true;
+        }
+        else{
+            return false;
+        }
+    }
+
+    public void addItemToFavoriteList(String listName, int itemId){
+        Set<Integer> list = favoriteItemLists.get(listName);
+        list.add(itemId);
+    }
+
+    public void removeItemFromList(String listName, int itemId) {
+        Set<Integer> set = favoriteItemLists.get(listName);
+        set.remove(itemId);
+    }
+
+    public void deleteItemList(String listName){
+        favoriteItemLists.remove(listName);
+    }
 }
diff --git a/src/main/java/com/flippingutilities/model/FlippingItem.java b/src/main/java/com/flippingutilities/model/FlippingItem.java
index c7f8b53e..ed9fd57b 100644
--- a/src/main/java/com/flippingutilities/model/FlippingItem.java
+++ b/src/main/java/com/flippingutilities/model/FlippingItem.java
@@ -38,6 +38,7 @@
 
 import java.time.Instant;
 import java.util.*;
+import java.util.function.Predicate;
 
 /**
  * This class is the representation of an item that a user is flipping. It contains information about the
@@ -119,6 +120,10 @@ public class FlippingItem implements Searchable
 	@Setter
 	private transient Boolean expand;
 
+	@Getter
+	private List<String> favoriteLists = new ArrayList<>();
+
+
 	public FlippingItem(int itemId, String itemName, int totalGeLimit, String flippedBy)
 	{
 		this.latestInstaBuy = Optional.empty();
@@ -148,7 +153,8 @@ public FlippingItem clone()
 				latestBuy,
 				latestSell,
 				latestActivityTime,
-				expand);
+				expand,
+				favoriteLists);
 	}
 
 	/**
@@ -389,4 +395,16 @@ public void hydrate(int geLimit) {
 	public String getNameForSearch() {
 		return itemName;
 	}
+
+	public boolean itemBelongsToList(String listName){
+		return favoriteLists.contains(listName);
+	}
+
+	public void addItemToList(String listName){
+		favoriteLists.add(listName);
+	}
+
+	public void removeItemFromList(String listName){
+		favoriteLists.remove(listName);
+	}
 }
diff --git a/src/main/java/com/flippingutilities/ui/flipping/FlippingItemPanel.java b/src/main/java/com/flippingutilities/ui/flipping/FlippingItemPanel.java
index 2650be3e..5faa22c6 100644
--- a/src/main/java/com/flippingutilities/ui/flipping/FlippingItemPanel.java
+++ b/src/main/java/com/flippingutilities/ui/flipping/FlippingItemPanel.java
@@ -28,6 +28,7 @@
 
 import com.flippingutilities.controller.FlippingPlugin;
 import com.flippingutilities.jobs.WikiDataFetcherJob;
+import com.flippingutilities.model.AccountWideData;
 import com.flippingutilities.model.FlippingItem;
 import com.flippingutilities.model.OfferEvent;
 import com.flippingutilities.model.Section;
@@ -50,9 +51,7 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.MatteBorder;
 import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.*;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
@@ -70,6 +69,9 @@ public class FlippingItemPanel extends JPanel
 	@Getter
 	private final FlippingItem flippingItem;
 	private FlippingPlugin plugin;
+	private AccountWideData accountWideData;
+
+	private JLabel favoriteIcon;
 
 	//All the labels that hold the actual values for these properties.
 	JLabel wikiBuyVal = new JLabel();
@@ -119,12 +121,13 @@ public class FlippingItemPanel extends JPanel
 	{
 		this.flippingItem = flippingItem;
 		this.plugin = plugin;
+		this.accountWideData = plugin.getDataHandler().getAccountWideData();
 		flippingItem.validateGeProperties();
 		setBackground(CustomColors.DARK_GRAY);
 		setLayout(new BorderLayout());
 		setBorder(new CompoundBorder(
-				new MatteBorder(2, 2, 2, 2, ColorScheme.DARKER_GRAY_COLOR.darker()),
-				new EmptyBorder(10,5,0,0)));
+			new MatteBorder(2, 2, 2, 2, ColorScheme.DARKER_GRAY_COLOR.darker()),
+			new EmptyBorder(10,5,0,0)));
 
 		setToolTipText("Flipped by " + flippingItem.getFlippedBy());
 
@@ -132,8 +135,9 @@ public class FlippingItemPanel extends JPanel
 		styleValueLabels();
 		setValueLabels();
 		updateTimerDisplays();
+		favoriteIcon = createFavoriteIcon();
 
-		JPanel titlePanel = createTitlePanel(createItemIcon(itemImage), createItemNameLabel(), createFavoriteIcon());
+		JPanel titlePanel = createTitlePanel(createItemIcon(itemImage), createItemNameLabel(), favoriteIcon);
 		itemInfo = createItemInfoPanel();
 		add(titlePanel, BorderLayout.NORTH);
 		add(itemInfo, BorderLayout.CENTER);
@@ -364,7 +368,7 @@ public void mouseExited(MouseEvent e) {
 			searchCodeLabel.setText("<html> quick search code: " + UIUtilities.colorText("N/A", ColorScheme.GRAND_EXCHANGE_ALCH) + "</html>");
 		}
 		searchCodeLabel.setToolTipText("<html>If you have favorited this item, you can type the search code when you are <br>" +
-				"searching for items in the ge to populate your ge results with any item with this code</html>");
+			"searching for items in the ge to populate your ge results with any item with this code</html>");
 		searchCodeLabel.setFont(FontManager.getRunescapeSmallFont());
 
 		searchCodePanel.add(searchCodeLabel);
@@ -531,10 +535,10 @@ private JPanel createGeTimerPanel() {
 	private void styleValueLabels() {
 		Arrays.asList(latestBuyPriceVal, latestSellPriceVal, instaSellVal, instaBuyVal, wikiProfitEachVal, marginCheckProfitEachVal, wikiPotentialProfitVal,
 			wikiRoiLabelVal, geLimitVal).
-				forEach(label -> {
-					label.setHorizontalAlignment(JLabel.RIGHT);
-					label.setFont(plugin.getFont());
-				});
+			forEach(label -> {
+				label.setHorizontalAlignment(JLabel.RIGHT);
+				label.setFont(plugin.getFont());
+			});
 
 		instaSellVal.setForeground(ColorScheme.GRAND_EXCHANGE_ALCH);
 		instaBuyVal.setForeground(ColorScheme.GRAND_EXCHANGE_ALCH);
@@ -573,10 +577,10 @@ private void styleValueLabels() {
 
 	private void styleDescriptionLabels() {
 		Arrays.asList(wikiBuyText, wikiSellText, latestBuyPriceText, latestSellPriceText, instaSellText, instaBuyText, wikiProfitEachText, marginCheckProfitEachText, wikiPotentialProfitText, geLimitText, wikiRoiText).
-				forEach(label -> {
-					label.setForeground(ColorScheme.GRAND_EXCHANGE_PRICE);
-					label.setFont(plugin.getFont());
-				});
+			forEach(label -> {
+				label.setForeground(ColorScheme.GRAND_EXCHANGE_PRICE);
+				label.setFont(plugin.getFont());
+			});
 
 		/* Tooltips */
 		instaSellText.setToolTipText("This is the price you insta sold the item for (pre tax)");
@@ -747,32 +751,37 @@ private JLabel createFavoriteIcon() {
 			public void mousePressed(MouseEvent e)
 			{
 				boolean wasDummy = false;
-				if (Constants.DUMMY_ITEM.equals(flippingItem.getFlippedBy())) {
-					wasDummy = true;
-					plugin.addFavoritedItem(flippingItem);
-				}
-
-				if (plugin.getAccountCurrentlyViewed().equals(FlippingPlugin.ACCOUNT_WIDE))
-				{
-					plugin.setFavoriteOnAllAccounts(flippingItem, !flippingItem.isFavorite());
+				if (SwingUtilities.isLeftMouseButton(e)){
+					if (Constants.DUMMY_ITEM.equals(flippingItem.getFlippedBy())) {
+						wasDummy = true;
+						plugin.addFavoritedItem(flippingItem);
+					}
+
+					if (plugin.getAccountCurrentlyViewed().equals(FlippingPlugin.ACCOUNT_WIDE))
+					{
+						plugin.setFavoriteOnAllAccounts(flippingItem, !flippingItem.isFavorite());
+					}
+					else {
+						plugin.markAccountTradesAsHavingChanged(plugin.getAccountCurrentlyViewed());
+					}
+
+					//if it was a dummy item and in the accountwide view, it has already had its favorite set by setFavoriteOnAllAccounts
+					boolean wasDummyAndAccountwide = wasDummy && plugin.getAccountCurrentlyViewed().equals(FlippingPlugin.ACCOUNT_WIDE);
+					if (!wasDummyAndAccountwide) {
+						flippingItem.setFavorite(!flippingItem.isFavorite());
+					}
+
+					favoriteIcon.setIcon(flippingItem.isFavorite()? Icons.STAR_ON_ICON:Icons.STAR_OFF_ICON);
+
+					if (flippingItem.isFavorite()) {
+						searchCodeLabel.setText("<html> quick search code: " + UIUtilities.colorText(flippingItem.getFavoriteCode(), ColorScheme.GRAND_EXCHANGE_PRICE) + "</html>");
+					}
+					else {
+						searchCodeLabel.setText("<html> quick search code: " + UIUtilities.colorText("N/A", ColorScheme.GRAND_EXCHANGE_ALCH) + "</html>");
+					}
 				}
-				else {
-					plugin.markAccountTradesAsHavingChanged(plugin.getAccountCurrentlyViewed());
-				}
-
-				//if it was a dummy item and in the accountwide view, it has already had its favorite set by setFavoriteOnAllAccounts
-				boolean wasDummyAndAccountwide = wasDummy && plugin.getAccountCurrentlyViewed().equals(FlippingPlugin.ACCOUNT_WIDE);
-				if (!wasDummyAndAccountwide) {
-					flippingItem.setFavorite(!flippingItem.isFavorite());
-				}
-
-				favoriteIcon.setIcon(flippingItem.isFavorite()? Icons.STAR_ON_ICON:Icons.STAR_OFF_ICON);
-
-				if (flippingItem.isFavorite()) {
-					searchCodeLabel.setText("<html> quick search code: " + UIUtilities.colorText(flippingItem.getFavoriteCode(), ColorScheme.GRAND_EXCHANGE_PRICE) + "</html>");
-				}
-				else {
-					searchCodeLabel.setText("<html> quick search code: " + UIUtilities.colorText("N/A", ColorScheme.GRAND_EXCHANGE_ALCH) + "</html>");
+				if (SwingUtilities.isRightMouseButton(e)){
+					createFavouritesListPopup().show(favoriteIcon,e.getX(),e.getY());
 				}
 			}
 
@@ -855,8 +864,8 @@ public void updateTimerDisplays() {
 		flippingItem.validateGeProperties();
 
 		geRefreshCountdownLabel.setText(flippingItem.getGeLimitResetTime() == null?
-				TimeFormatters.formatDuration(Duration.ZERO):
-				TimeFormatters.formatDuration(Instant.now(), flippingItem.getGeLimitResetTime()));
+			TimeFormatters.formatDuration(Duration.ZERO):
+			TimeFormatters.formatDuration(Instant.now(), flippingItem.getGeLimitResetTime()));
 
 		//need to update this so it can be reset when the timer runs down.
 		if (flippingItem.getTotalGELimit() > 0) {
@@ -971,4 +980,42 @@ private JPanel createWikiHoverTimePanel() {
 		return wikiTimePanel;
 	}
 
+	/**
+	 * This creates the popup that allows users to add an item to a favorite list. It shows when you right click
+	 * the favorite icon on a flipping card (FlippingItemPanel).
+	 * @return
+	 */
+	private JPopupMenu createFavouritesListPopup() {
+		JPopupMenu favouritesListPopup = new JPopupMenu();
+		ActionListener menuListener = event -> {
+			String list = event.getActionCommand();
+			//removes item from list if it exists in the selected list
+			if (flippingItem.itemBelongsToList(list)){
+				accountWideData.removeItemFromList(list,flippingItem.getItemId());
+				flippingItem.removeItemFromList(list);
+				plugin.getFlippingPanel().rebuild(plugin.viewItemsForCurrentView());
+			}
+			else {
+				accountWideData.addItemToFavoriteList(list,flippingItem.getItemId());
+				flippingItem.addItemToList(list);
+			}
+		};
+
+		for (String key : accountWideData.getAllListNames()){
+			JMenuItem menuItem = new JMenuItem(key);
+			favouritesListPopup.add(menuItem);
+			menuItem.addActionListener(menuListener);
+
+			if (flippingItem.getFavoriteLists().contains(key)){
+				menuItem.setForeground(ColorScheme.BRAND_ORANGE);
+			}
+		}
+
+
+		favouritesListPopup.setBorder(BorderFactory.createMatteBorder(1,1,1,1, ColorScheme.DARKER_GRAY_COLOR.darker()));
+		favouritesListPopup.setBackground(CustomColors.DARK_GRAY_LIGHTER);
+
+		return favouritesListPopup;
+	}
+
 }
diff --git a/src/main/java/com/flippingutilities/ui/flipping/FlippingPanel.java b/src/main/java/com/flippingutilities/ui/flipping/FlippingPanel.java
index c0af49cc..b50fe6e9 100644
--- a/src/main/java/com/flippingutilities/ui/flipping/FlippingPanel.java
+++ b/src/main/java/com/flippingutilities/ui/flipping/FlippingPanel.java
@@ -27,14 +27,15 @@
 package com.flippingutilities.ui.flipping;
 
 import com.flippingutilities.controller.FlippingPlugin;
+import com.flippingutilities.model.AccountWideData;
 import com.flippingutilities.model.FlippingItem;
 import com.flippingutilities.model.OfferEvent;
 import com.flippingutilities.ui.offereditor.OfferEditorContainerPanel;
+import com.flippingutilities.ui.uiutilities.CustomColors;
 import com.flippingutilities.ui.uiutilities.Icons;
 import com.flippingutilities.ui.uiutilities.Paginator;
 import com.flippingutilities.ui.uiutilities.UIUtilities;
 import com.flippingutilities.utilities.Constants;
-import com.flippingutilities.utilities.Searchable;
 import com.flippingutilities.utilities.WikiRequest;
 import com.google.common.base.Strings;
 import lombok.Getter;
@@ -45,337 +46,455 @@
 import net.runelite.client.ui.components.IconTextField;
 import net.runelite.client.ui.components.PluginErrorPanel;
 import net.runelite.http.api.item.ItemPrice;
-import net.runelite.http.api.item.ItemStats;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.MatteBorder;
 import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import java.awt.event.*;
 import java.time.Instant;
-import java.util.*;
 import java.util.List;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
-public class FlippingPanel extends JPanel
-{
-	@Getter
-	private static final String WELCOME_PANEL = "WELCOME_PANEL";
-	private static final String ITEMS_PANEL = "ITEMS_PANEL";
-
-	private final FlippingPlugin plugin;
-	private final ItemManager itemManager;
-
-	public final CardLayout cardLayout = new CardLayout();
-
-	private final JPanel flippingItemsPanel = new JPanel();
-	public final JPanel flippingItemContainer = new JPanel(cardLayout);
-
-	//Keeps track of all items currently displayed on the panel.
-	private ArrayList<FlippingItemPanel> activePanels = new ArrayList<>();
-
-	@Getter
-	@Setter
-	private boolean itemHighlighted = false;
-
-	@Getter
-	private Paginator paginator;
-
-	@Getter
-	private OfferEditorContainerPanel offerEditorContainerPanel;
-	private IconTextField searchBar;
-
-	private boolean currentlySearching;
-	private boolean favoriteSelected;
-
-	public FlippingPanel(final FlippingPlugin plugin)
-	{
-		super(false);
-
-		this.plugin = plugin;
-		this.itemManager = plugin.getItemManager();
-
-
-		setLayout(new BorderLayout());
-		setBackground(ColorScheme.DARK_GRAY_COLOR);
-
-		//Holds all the item panels
-		flippingItemsPanel.setLayout(new BoxLayout(flippingItemsPanel, BoxLayout.Y_AXIS));
-		flippingItemsPanel.setBorder((new EmptyBorder(0, 8, 0, 7)));
-		flippingItemsPanel.setBackground(ColorScheme.DARK_GRAY_COLOR);
-
-		JPanel wrapper = new JPanel(new BorderLayout());
-		wrapper.setBackground(ColorScheme.DARK_GRAY_COLOR);
-		wrapper.add(flippingItemsPanel, BorderLayout.NORTH);
-
-		JScrollPane scrollPane = new JScrollPane(wrapper);
-		scrollPane.setBackground(ColorScheme.DARK_GRAY_COLOR);
-		scrollPane.getVerticalScrollBar().setPreferredSize(new Dimension(2, 0));
-
-		//Contains a greeting message when the items panel is empty.
-		JPanel welcomeWrapper = new JPanel(new BorderLayout());
-		welcomeWrapper.setBackground(ColorScheme.DARK_GRAY_COLOR);
-		PluginErrorPanel welcomePanel = new PluginErrorPanel();
-		welcomeWrapper.add(welcomePanel, BorderLayout.NORTH);
-
-		//The welcome panel instructs the user on how to use the plugin
-		//Shown whenever there are no items on the panel
-		welcomePanel.setContent("Flipping Utilities",
-			"Make offers for items to show up!");
-
-		flippingItemContainer.add(scrollPane, ITEMS_PANEL);
-		flippingItemContainer.add(welcomeWrapper, WELCOME_PANEL);
-
-		searchBar = UIUtilities.createSearchBar(plugin.getExecutor(),
-				(sBar) -> plugin.getClientThread().invoke(() -> this.updateSearch(sBar)));
-		searchBar.setBorder(BorderFactory.createMatteBorder(1,1,1,1, ColorScheme.DARKER_GRAY_COLOR.darker()));
-
-		final JPanel topPanel = new JPanel(new BorderLayout());
-		topPanel.setBorder(new EmptyBorder(0,8,2,10));
-		topPanel.add(searchBar, BorderLayout.CENTER);
-		topPanel.add(this.createFavoriteButton(), BorderLayout.EAST);
-
-		paginator = new Paginator(() -> rebuild(plugin.viewItemsForCurrentView()));
-		paginator.setBackground(ColorScheme.DARK_GRAY_COLOR);
-		paginator.setBorder(new MatteBorder(1,0,0,2, ColorScheme.DARK_GRAY_COLOR.darker()));
-		paginator.setPageSize(10);
-
-		//To switch between greeting and items panels
-		cardLayout.show(flippingItemContainer, WELCOME_PANEL);
-		add(topPanel, BorderLayout.NORTH);
-		add(flippingItemContainer, BorderLayout.CENTER);
-		add(paginator, BorderLayout.SOUTH);
-		setBorder(new EmptyBorder(5,0,0,0));
-	}
-
-	/**
-	 * Creates and renders the panel using the flipping items in the listed parameter.
-	 * An item is only displayed if it contains a valid OfferInfo object in its history.
-	 *
-	 * @param flippingItems List of flipping items that the rebuildItemsDisplay will render.
-	 */
-	public void rebuild(List<FlippingItem> flippingItems)
-	{
-		SwingUtilities.invokeLater(() ->
-		{
-			activePanels.forEach(p -> p.popup.setVisible(false));
-			activePanels.clear();
-			flippingItemsPanel.removeAll();
-			if (flippingItems == null)
-			{
-				cardLayout.show(flippingItemContainer, WELCOME_PANEL);
-				return;
-			}
-			int vGap = 8;
-			cardLayout.show(flippingItemContainer, ITEMS_PANEL);
-			List<FlippingItem> itemsToDisplay = getItemsToDisplay(flippingItems);
-			List<FlippingItem> itemsThatShouldHavePanels = itemsToDisplay.stream().filter(item -> item.getValidFlippingPanelItem()).collect(Collectors.toList());
-			paginator.updateTotalPages(itemsThatShouldHavePanels.size());
-			List<FlippingItem> itemsOnCurrentPage = paginator.getCurrentPageItems(itemsThatShouldHavePanels);
-			List<FlippingItemPanel> newPanels = itemsOnCurrentPage.stream().map(item -> new FlippingItemPanel(plugin, itemManager.getImage(item.getItemId()), item)).collect(Collectors.toList());
-			flippingItemsPanel.add(Box.createVerticalStrut(vGap));
-			UIUtilities.stackPanelsVertically((List) newPanels, flippingItemsPanel, vGap);
-			flippingItemsPanel.add(Box.createVerticalStrut(vGap));
-			activePanels.addAll(newPanels);
-
-			if (isItemHighlighted()) {
-				offerEditorContainerPanel = new OfferEditorContainerPanel(plugin);
-				offerEditorContainerPanel.selectPriceEditor();
-				flippingItemsPanel.add(offerEditorContainerPanel);
-				flippingItemsPanel.add(Box.createVerticalStrut(vGap));
-			}
-
-			if (activePanels.isEmpty() && !itemHighlighted)
-			{
-				cardLayout.show(flippingItemContainer, WELCOME_PANEL);
-			}
-
-			revalidate();
-			repaint();
-		});
-
-	}
-
-	/**
-	 * Handles rebuilding the flipping panel when a new offer event comes in. There are several cases
-	 * where we don't want to rebuildItemsDisplay either because it is unnecessary or visually annoying for a user.
-	 * @param offerEvent the new offer that just came in
-	 */
-	public void onNewOfferEventRebuild(OfferEvent offerEvent) {
-		boolean newOfferEventAlreadyAtTop = activePanels.size() > 0 && activePanels.get(0).getFlippingItem().getItemId() == offerEvent.getItemId();
-		if (newOfferEventAlreadyAtTop) {
-			refreshPricesForFlippingItemPanel(offerEvent.getItemId());
-			return;
-		}
-		//it's annoying when you have searched an item up or an item is
-		//highlighted and then the panel is rebuilt due to an offer coming in. This guard prevents that.
-		if (!isItemHighlighted() && !currentlySearching) {
-			rebuild(plugin.viewItemsForCurrentView());
-		}
-	}
-
-	private List<FlippingItem> getItemsToDisplay(List<FlippingItem> tradeList) {
-		List<FlippingItem> result = new ArrayList<>(tradeList);
-
-		if (favoriteSelected && !isItemHighlighted()) {
-			result = result.stream().filter(FlippingItem::isFavorite).collect(Collectors.toList());
-		}
-		result = getResultsForCurrentSearchQuery(result);
-		sortByTime(result);
-		return result;
-	}
-
-	private List<FlippingItem> getResultsForCurrentSearchQuery(List<FlippingItem> items) {
-		String lookup = searchBar.getText().toLowerCase();
-		if (!currentlySearching || Strings.isNullOrEmpty(lookup)) {
-			return items;
-		}
-		Map<Integer, FlippingItem> currentFlippingItems = items.stream().collect(Collectors.toMap(f -> f.getItemId(), f -> f));
-		List<FlippingItem> matchesInHistory = new ArrayList<>();
-		List<FlippingItem> matchesNotInHistory = new ArrayList<>();
-		for (ItemPrice itemInfo:  itemManager.search(lookup)) {
-			if (currentFlippingItems.containsKey(itemInfo.getId())) {
-				FlippingItem flippingItem = currentFlippingItems.get(itemInfo.getId());
-				flippingItem.setValidFlippingPanelItem(true);
-				matchesInHistory.add(flippingItem);
-			}
-			else {
-				FlippingItem dummyFlippingItem = new FlippingItem(itemInfo.getId(), itemInfo.getName(), 0, Constants.DUMMY_ITEM);
-				dummyFlippingItem.setValidFlippingPanelItem(true);
-				matchesNotInHistory.add(dummyFlippingItem);
-			}
-		}
-
-		List<FlippingItem> allMatches = new ArrayList<>();
-		allMatches.addAll(matchesInHistory);
-		allMatches.addAll(matchesNotInHistory);
-		return allMatches;
-	}
-
-	private void sortByTime(List<FlippingItem> items) {
-		items.sort((item1, item2) ->
-		{
-			if (item1 == null || item2 == null)
-			{
-				return -1;
-			}
-			if (item1.getLatestActivityTime() == null || item2.getLatestActivityTime() == null) {
-				return -1;
-			}
-
-			return item2.getLatestActivityTime().compareTo(item1.getLatestActivityTime());
-		});
-	}
-
-	//Clears all other items, if the item in the offer setup slot is presently available on the panel
-	public void highlightItem(FlippingItem item)
-	{
-		SwingUtilities.invokeLater(() -> {
-			paginator.setPageNumber(1);
-			itemHighlighted = true;
-			rebuild(Collections.singletonList(item));
-		});
-	}
-
-	private JLabel createFavoriteButton() {
-		JLabel favoriteButton = new JLabel(Icons.SMALL_STAR_OFF_ICON);
-		favoriteButton.setBorder(new EmptyBorder(0,5,0,0));
-		favoriteButton.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mousePressed(MouseEvent e) {
-				if (favoriteSelected) {
-					favoriteButton.setIcon(Icons.SMALL_STAR_OFF_ICON);
-				}
-				else {
-					favoriteButton.setIcon(Icons.SMALL_STAR_ON_ICON);
-				}
-				favoriteSelected = !favoriteSelected;
-				rebuild(plugin.viewItemsForCurrentView());
-			}
-
-			@Override
-			public void mouseEntered(MouseEvent e) {
-				if (!favoriteSelected) {
-					favoriteButton.setIcon(Icons.SMALL_STAR_HOVER_ICON);
-				}
-			}
-
-			@Override
-			public void mouseExited(MouseEvent e) {
-				if (favoriteSelected) {
-					favoriteButton.setIcon(Icons.SMALL_STAR_ON_ICON);
-				}
-				else {
-					favoriteButton.setIcon(Icons.SMALL_STAR_OFF_ICON);
-				}
-			}
-		});
-		return favoriteButton;
-	}
-
-	//This is run whenever the PlayerVar containing the GE offer slot changes to its empty value (-1)
-	// or if the GE is closed/history tab opened
-	public void dehighlightItem()
-	{
-		if (!itemHighlighted)
-		{
-			return;
-		}
-		itemHighlighted = false;
-		rebuild(plugin.viewItemsForCurrentView());
-	}
-
-	/**
-	 * Checks if a FlippingItem's margins (buy and sell price) are outdated and updates the tooltip.
-	 * This method is called in FlippingPlugin every second by the scheduler.
-	 */
-	public void updateTimerDisplays()
-	{
-		for (FlippingItemPanel activePanel : activePanels)
-		{
-			activePanel.updateTimerDisplays();
-			activePanel.updateWikiTimeLabels();
-		}
-	}
-
-	public void updateWikiDisplays(WikiRequest wikiRequest, Instant timeOfRequestCompletion) {
-		activePanels.forEach(panel -> panel.updateWikiLabels(wikiRequest, timeOfRequestCompletion));
-	}
-
-
-	private void updateSearch(IconTextField searchBar)
-	{
-		String lookup = searchBar.getText().toLowerCase();
-
-		//Just so we don't mess with the highlight.
-		if (isItemHighlighted())
-		{
-			currentlySearching = false;
-			return;
-		}
-
-		//When the clear button is pressed, this is run.
-		if (Strings.isNullOrEmpty(lookup))
-		{
-			paginator.setPageNumber(1);
-			currentlySearching = false;
-			rebuild(plugin.viewItemsForCurrentView());
-			return;
-		}
-
-		searchBar.setIcon(IconTextField.Icon.SEARCH);
-		currentlySearching = true;
-		paginator.setPageNumber(1);
-		rebuild(plugin.viewItemsForCurrentView());
-	}
-
-	public void refreshPricesForFlippingItemPanel(int itemId) {
-		for (FlippingItemPanel panel:activePanels) {
-			if (panel.getFlippingItem().getItemId() == itemId) {
-				panel.setValueLabels();
-			}
-		}
-	}
+public class FlippingPanel extends JPanel {
+    @Getter
+    private static final String WELCOME_PANEL = "WELCOME_PANEL";
+    private static final String ITEMS_PANEL = "ITEMS_PANEL";
+
+    private final FlippingPlugin plugin;
+    private final ItemManager itemManager;
+
+    public final CardLayout cardLayout = new CardLayout();
+
+    private final JPanel flippingItemsPanel = new JPanel();
+    public final JPanel flippingItemContainer = new JPanel(cardLayout);
+
+    private JPopupMenu favouritesListPopup;
+
+    //Keeps track of all items currently displayed on the panel.
+    private ArrayList<FlippingItemPanel> activePanels = new ArrayList<>();
+
+    @Getter
+    @Setter
+    private boolean itemHighlighted = false;
+
+    @Getter
+    private Paginator paginator;
+
+    @Getter
+    private OfferEditorContainerPanel offerEditorContainerPanel;
+    private IconTextField searchBar;
+
+    private boolean currentlySearching;
+
+    private String selectedFavoriteList;
+
+    private JLabel favoriteButton;
+
+    private List<JMenuItem> favoriteListPopopMenuItems = new ArrayList<>();
+    ButtonGroup buttonGroup = new ButtonGroup();
+
+    public FlippingPanel(final FlippingPlugin plugin) {
+        super(false);
+
+        this.plugin = plugin;
+        this.itemManager = plugin.getItemManager();
+
+        setLayout(new BorderLayout());
+        setBackground(ColorScheme.DARK_GRAY_COLOR);
+
+        //Holds all the item panels
+        flippingItemsPanel.setLayout(new BoxLayout(flippingItemsPanel, BoxLayout.Y_AXIS));
+        flippingItemsPanel.setBorder((new EmptyBorder(0, 8, 0, 7)));
+        flippingItemsPanel.setBackground(ColorScheme.DARK_GRAY_COLOR);
+
+        JPanel wrapper = new JPanel(new BorderLayout());
+        wrapper.setBackground(ColorScheme.DARK_GRAY_COLOR);
+        wrapper.add(flippingItemsPanel, BorderLayout.NORTH);
+
+        JScrollPane scrollPane = new JScrollPane(wrapper);
+        scrollPane.setBackground(ColorScheme.DARK_GRAY_COLOR);
+        scrollPane.getVerticalScrollBar().setPreferredSize(new Dimension(2, 0));
+
+        //Contains a greeting message when the items panel is empty.
+        JPanel welcomeWrapper = new JPanel(new BorderLayout());
+        welcomeWrapper.setBackground(ColorScheme.DARK_GRAY_COLOR);
+        PluginErrorPanel welcomePanel = new PluginErrorPanel();
+        welcomeWrapper.add(welcomePanel, BorderLayout.NORTH);
+
+        //The welcome panel instructs the user on how to use the plugin
+        //Shown whenever there are no items on the panel
+        welcomePanel.setContent("Flipping Utilities",
+            "Make offers for items to show up!");
+
+        flippingItemContainer.add(scrollPane, ITEMS_PANEL);
+        flippingItemContainer.add(welcomeWrapper, WELCOME_PANEL);
+
+        searchBar = UIUtilities.createSearchBar(plugin.getExecutor(),
+            (sBar) -> plugin.getClientThread().invoke(() -> this.updateSearch(sBar)));
+        searchBar.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, ColorScheme.DARKER_GRAY_COLOR.darker()));
+
+        favoriteButton = this.createFavoriteButton();
+
+        final JPanel topPanel = new JPanel(new BorderLayout());
+        topPanel.setBorder(new EmptyBorder(0, 8, 2, 10));
+        topPanel.add(searchBar, BorderLayout.CENTER);
+        topPanel.add(favoriteButton, BorderLayout.EAST);
+
+        paginator = new Paginator(() -> rebuild(plugin.viewItemsForCurrentView()));
+        paginator.setBackground(ColorScheme.DARK_GRAY_COLOR);
+        paginator.setBorder(new MatteBorder(1, 0, 0, 2, ColorScheme.DARK_GRAY_COLOR.darker()));
+        paginator.setPageSize(10);
+
+        //To switch between greeting and items panels
+        cardLayout.show(flippingItemContainer, WELCOME_PANEL);
+        add(topPanel, BorderLayout.NORTH);
+        add(flippingItemContainer, BorderLayout.CENTER);
+        add(paginator, BorderLayout.SOUTH);
+        setBorder(new EmptyBorder(5, 0, 0, 0));
+    }
+
+    /**
+     * Creates and renders the panel using the flipping items in the listed parameter.
+     * An item is only displayed if it contains a valid OfferInfo object in its history.
+     *
+     * @param flippingItems List of flipping items that the rebuildItemsDisplay will render.
+     */
+    public void rebuild(List<FlippingItem> flippingItems)// pass list name here
+    {
+        SwingUtilities.invokeLater(() ->
+        {
+            activePanels.forEach(p -> p.popup.setVisible(false));
+            activePanels.clear();
+            flippingItemsPanel.removeAll();
+            if (flippingItems == null) {
+                cardLayout.show(flippingItemContainer, WELCOME_PANEL);
+                return;
+            }
+            int vGap = 8;
+            cardLayout.show(flippingItemContainer, ITEMS_PANEL);
+            List<FlippingItem> itemsToDisplay = getItemsToDisplay(flippingItems);
+            List<FlippingItem> itemsThatShouldHavePanels = itemsToDisplay.stream().filter(item -> item.getValidFlippingPanelItem()).collect(Collectors.toList());
+            paginator.updateTotalPages(itemsThatShouldHavePanels.size());
+            List<FlippingItem> itemsOnCurrentPage = paginator.getCurrentPageItems(itemsThatShouldHavePanels);
+            List<FlippingItemPanel> newPanels = itemsOnCurrentPage.stream().map(item -> new FlippingItemPanel(plugin, itemManager.getImage(item.getItemId()), item)).collect(Collectors.toList());
+            flippingItemsPanel.add(Box.createVerticalStrut(vGap));
+            UIUtilities.stackPanelsVertically((List) newPanels, flippingItemsPanel, vGap);
+            flippingItemsPanel.add(Box.createVerticalStrut(vGap));
+            activePanels.addAll(newPanels);
+
+            if (isItemHighlighted()) {
+                offerEditorContainerPanel = new OfferEditorContainerPanel(plugin);
+                offerEditorContainerPanel.selectPriceEditor();
+                flippingItemsPanel.add(offerEditorContainerPanel);
+                flippingItemsPanel.add(Box.createVerticalStrut(vGap));
+            }
+
+            if (activePanels.isEmpty() && !itemHighlighted) {
+                cardLayout.show(flippingItemContainer, WELCOME_PANEL);
+            }
+
+            revalidate();
+            repaint();
+        });
+
+    }
+
+    /**
+     * Handles rebuilding the flipping panel when a new offer event comes in. There are several cases
+     * where we don't want to rebuildItemsDisplay either because it is unnecessary or visually annoying for a user.
+     *
+     * @param offerEvent the new offer that just came in
+     */
+    public void onNewOfferEventRebuild(OfferEvent offerEvent) {
+        boolean newOfferEventAlreadyAtTop = activePanels.size() > 0 && activePanels.get(0).getFlippingItem().getItemId() == offerEvent.getItemId();
+        if (newOfferEventAlreadyAtTop) {
+            refreshPricesForFlippingItemPanel(offerEvent.getItemId());
+            return;
+        }
+        //it's annoying when you have searched an item up or an item is
+        //highlighted and then the panel is rebuilt due to an offer coming in. This guard prevents that.
+        if (!isItemHighlighted() && !currentlySearching) {
+            rebuild(plugin.viewItemsForCurrentView());
+        }
+    }
+
+    /**
+     * Responsible for filtering items based on search query and favorite selection. Currently, it is passed
+     * items only by rebuild which usually just calls passes in all the items for the currently viewed account
+     * to this method.
+     */
+    private List<FlippingItem> getItemsToDisplay(List<FlippingItem> items) {
+        List<FlippingItem> result = new ArrayList<>(items);
+
+        if (selectedFavoriteList != null && !isItemHighlighted()) {
+            //The "acc specific" favorite list is just the account specific favorite list. It is the default
+            //favorite list shown when click on the favorite icon.
+            if (selectedFavoriteList.equals("acc specific")) {
+                result = result.stream().filter(FlippingItem::isFavorite).collect(Collectors.toList());
+            }
+            //otherwise, if the selected favorite list is not the account specific one, get the it from the global
+            //favorite lists, available in AccountWideData.
+            else {
+                Set<Integer> itemsInSelectedFavoriteList = plugin.getDataHandler().viewAccountWideData().getFavoriteListData(selectedFavoriteList);
+                if (itemsInSelectedFavoriteList != null) {
+                    result = items.stream().filter(i -> itemsInSelectedFavoriteList.contains(i.getItemId())).collect(Collectors.toList());
+                }
+            }
+        }
+
+        result = getResultsForCurrentSearchQuery(result);
+        sortByTime(result);
+        return result;
+    }
+
+    private List<FlippingItem> getResultsForCurrentSearchQuery(List<FlippingItem> items) {
+        String lookup = searchBar.getText().toLowerCase();
+        if (!currentlySearching || Strings.isNullOrEmpty(lookup)) {
+            return items;
+        }
+        Map<Integer, FlippingItem> currentFlippingItems = items.stream().collect(Collectors.toMap(f -> f.getItemId(), f -> f));
+        List<FlippingItem> matchesInHistory = new ArrayList<>();
+        List<FlippingItem> matchesNotInHistory = new ArrayList<>();
+        for (ItemPrice itemInfo : itemManager.search(lookup)) {
+            if (currentFlippingItems.containsKey(itemInfo.getId())) {
+                FlippingItem flippingItem = currentFlippingItems.get(itemInfo.getId());
+                flippingItem.setValidFlippingPanelItem(true);
+                matchesInHistory.add(flippingItem);
+            } else {
+                FlippingItem dummyFlippingItem = new FlippingItem(itemInfo.getId(), itemInfo.getName(), 0, Constants.DUMMY_ITEM);
+                dummyFlippingItem.setValidFlippingPanelItem(true);
+                matchesNotInHistory.add(dummyFlippingItem);
+            }
+        }
+
+        List<FlippingItem> allMatches = new ArrayList<>();
+        allMatches.addAll(matchesInHistory);
+        allMatches.addAll(matchesNotInHistory);
+        return allMatches;
+    }
+
+    private void sortByTime(List<FlippingItem> items) {
+        items.sort((item1, item2) ->
+        {
+            if (item1 == null || item2 == null) {
+                return -1;
+            }
+            if (item1.getLatestActivityTime() == null || item2.getLatestActivityTime() == null) {
+                return -1;
+            }
+
+            return item2.getLatestActivityTime().compareTo(item1.getLatestActivityTime());
+        });
+    }
+
+    //Clears all other items, if the item in the offer setup slot is presently available on the panel
+    public void highlightItem(FlippingItem item) {
+        SwingUtilities.invokeLater(() -> {
+            paginator.setPageNumber(1);
+            itemHighlighted = true;
+            rebuild(Collections.singletonList(item));
+        });
+    }
+
+    private JLabel createFavoriteButton() {
+        JLabel favoriteButton = new JLabel(Icons.SMALL_STAR_OFF_ICON);
+        favoriteButton.setBorder(new EmptyBorder(0, 5, 0, 0));
+        favoriteButton.addMouseListener(new MouseAdapter() {
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (SwingUtilities.isLeftMouseButton(e)) {
+                    boolean favoriteSelected = selectedFavoriteList != null;
+                    favoriteButton.setIcon(favoriteSelected? Icons.SMALL_STAR_OFF_ICON: Icons.SMALL_STAR_ON_ICON);
+                    selectedFavoriteList = favoriteSelected? null: "acc specific";
+                    rebuild(plugin.viewItemsForCurrentView());
+                }
+                else {
+                    if (favouritesListPopup == null) {
+                        favouritesListPopup = createFavouritesListPopup();
+                    }
+                    if (selectedFavoriteList == null) {
+                        buttonGroup.clearSelection();
+                    }
+                    else {
+                        favoriteListPopopMenuItems.forEach(menuItem -> {
+                            if (menuItem.getText().equals(selectedFavoriteList)) {
+                                menuItem.setSelected(true);
+                            }
+                        });
+                    }
+                    favouritesListPopup.show(favoriteButton, e.getX(), e.getY());
+                }
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                if (selectedFavoriteList == null) {
+                    favoriteButton.setIcon(Icons.SMALL_STAR_HOVER_ICON);
+                }
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                favoriteButton.setIcon(selectedFavoriteList != null? Icons.SMALL_STAR_ON_ICON: Icons.SMALL_STAR_OFF_ICON);
+            }
+        });
+        return favoriteButton;
+    }
+
+    //This is run whenever the PlayerVar containing the GE offer slot changes to its empty value (-1)
+    // or if the GE is closed/history tab opened
+    public void dehighlightItem() {
+        if (!itemHighlighted) {
+            return;
+        }
+        itemHighlighted = false;
+        rebuild(plugin.viewItemsForCurrentView());
+    }
+
+    /**
+     * Checks if a FlippingItem's margins (buy and sell price) are outdated and updates the tooltip.
+     * This method is called in FlippingPlugin every second by the scheduler.
+     */
+    public void updateTimerDisplays() {
+        for (FlippingItemPanel activePanel : activePanels) {
+            activePanel.updateTimerDisplays();
+            activePanel.updateWikiTimeLabels();
+        }
+    }
+
+    public void updateWikiDisplays(WikiRequest wikiRequest, Instant timeOfRequestCompletion) {
+        activePanels.forEach(panel -> panel.updateWikiLabels(wikiRequest, timeOfRequestCompletion));
+    }
+
+
+    private void updateSearch(IconTextField searchBar) {
+        String lookup = searchBar.getText().toLowerCase();
+
+        //Just so we don't mess with the highlight.
+        if (isItemHighlighted()) {
+            currentlySearching = false;
+            return;
+        }
+
+        //When the clear button is pressed, this is run.
+        if (Strings.isNullOrEmpty(lookup)) {
+            paginator.setPageNumber(1);
+            currentlySearching = false;
+            rebuild(plugin.viewItemsForCurrentView());
+            return;
+        }
+
+        searchBar.setIcon(IconTextField.Icon.SEARCH);
+        currentlySearching = true;
+        paginator.setPageNumber(1);
+        rebuild(plugin.viewItemsForCurrentView());
+    }
+
+    public void refreshPricesForFlippingItemPanel(int itemId) {
+        for (FlippingItemPanel panel : activePanels) {
+            if (panel.getFlippingItem().getItemId() == itemId) {
+                panel.setValueLabels();
+            }
+        }
+    }
+
+    /**
+     * This creates the popup that allows users to select a favorite list to display. It shows as a result
+     * of right clicking on the favorite icon.
+     */
+    private JPopupMenu createFavouritesListPopup() {
+        AccountWideData accountWideData = plugin.getDataHandler().viewAccountWideData();
+        //holds all menu items except for the one used to create a new favorite list
+        List<JMenuItem> menuItems = new ArrayList<>();
+        JPopupMenu favouritesListPopup = new JPopupMenu();
+        JMenuItem createFavoriteList = new JMenuItem("Add +");
+        JMenuItem accSpecific = new JRadioButtonMenuItem("acc specific");
+
+        //triggers when you select a favorite list from the popup, this is attached to every menu item except the
+        //one menu item responsible for creating new menu items when you click on it.
+        ItemListener regularMenuItemListener = itemEvent -> {
+            if (itemEvent.getStateChange() == ItemEvent.SELECTED) {
+                Object clicked = itemEvent.getSource();
+                selectedFavoriteList = ((JMenuItem) clicked).getText();
+                favoriteButton.setIcon(Icons.SMALL_STAR_ON_ICON);
+                rebuild(plugin.viewItemsForCurrentView());
+            }
+        };
+
+         //adds the delete listener to a menu item. The delete listener triggers on a rightclick on a menu item
+        //and deletes the menu item and favorite list.
+         Consumer<JMenuItem> addDeleteListener = (JMenuItem newMenuItem) -> {
+             newMenuItem.addMouseListener(
+                 new MouseAdapter() {
+                     @Override
+                     public void mousePressed(MouseEvent e) {
+                         if (SwingUtilities.isRightMouseButton(e)) {
+                             int result = JOptionPane.showConfirmDialog(newMenuItem, "Are you sure you want to delete this list?", "Delete Item List?", JOptionPane.YES_NO_OPTION);
+                             if (result == JOptionPane.YES_OPTION) {
+                                 accountWideData.deleteItemList(newMenuItem.getActionCommand());
+                                 favouritesListPopup.remove(newMenuItem);
+                                 buttonGroup.remove(newMenuItem);
+                                 favoriteListPopopMenuItems.remove(newMenuItem);
+                                 //if they just deleted the currently selected favorite list
+                                 if (Objects.equals(selectedFavoriteList, newMenuItem.getActionCommand())) {
+                                     selectedFavoriteList = null;
+                                     favoriteButton.setIcon(Icons.SMALL_STAR_OFF_ICON);
+                                     buttonGroup.clearSelection();
+                                     rebuild(plugin.viewItemsForCurrentView());
+                                 }
+                             }
+                         }
+                     }
+                 }
+             );
+         };
+
+        ActionListener createNewListListener = event -> {
+            if (Objects.equals(event.getActionCommand(), "Add +")) {
+                String newFavoriteListName = JOptionPane.showInputDialog("Enter Favorite List Name");
+
+                if (!Objects.equals(newFavoriteListName, "") && accountWideData.addNewFavoriteList(newFavoriteListName)) {
+                    JMenuItem newMenuItem = new JRadioButtonMenuItem(newFavoriteListName);
+                    newMenuItem.addItemListener(regularMenuItemListener);
+                    addDeleteListener.accept(newMenuItem);
+                    favouritesListPopup.add(newMenuItem);
+                    buttonGroup.add(newMenuItem);
+                } else {
+                    JOptionPane.showMessageDialog(favouritesListPopup, "List Already Exists!");
+                }
+            }
+        };
+
+
+        menuItems.add(accSpecific);
+        for (String key : accountWideData.getAllListNames()) {
+            menuItems.add(new JRadioButtonMenuItem(key));
+        }
+
+        for (JMenuItem menuItem : menuItems) {
+            menuItem.addItemListener(regularMenuItemListener);
+            if (menuItem != accSpecific) {
+                addDeleteListener.accept(menuItem);
+            }
+            buttonGroup.add(menuItem);
+            favoriteListPopopMenuItems.add(menuItem);
+            favouritesListPopup.add(menuItem);
+        }
+
+        createFavoriteList.addActionListener(createNewListListener);
+
+        favouritesListPopup.add(createFavoriteList);
+
+        favouritesListPopup.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, ColorScheme.DARKER_GRAY_COLOR.darker()));
+        favouritesListPopup.setBackground(CustomColors.DARK_GRAY_LIGHTER);
+        createFavoriteList.setBackground(ColorScheme.DARK_GRAY_COLOR);
+
+        return favouritesListPopup;
+    }
 }