diff --git a/Agenda/AddArtistPanel.java b/Agenda/AddArtistPanel.java
new file mode 100644
index 0000000..49e2817
--- /dev/null
+++ b/Agenda/AddArtistPanel.java
@@ -0,0 +1,126 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+
+public class AddArtistPanel extends JFrame{
+
+	private static final long serialVersionUID = 1;
+
+	public AddArtistPanel(Agenda agenda)
+	{
+		super("Artist addscreen!");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		JPanel content = new JPanel(new BorderLayout());
+		JPanel south = new JPanel(new FlowLayout());
+		JPanel center = new JPanel(new GridLayout(5,2));
+		content.add(south, BorderLayout.SOUTH);
+		content.add(center, BorderLayout.CENTER);
+		
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Artist name: ");
+		panel1.add(name);
+		center.add(panel1);
+		
+		JPanel panel2 = new JPanel();
+		JTextField nameTF = new JTextField("",15);
+		panel2.add(nameTF);
+		center.add(panel2);
+		
+		JLabel genre = new JLabel("Genre: ");
+		JPanel panel3 = new JPanel();
+		panel3.add(genre);
+		center.add(panel3);
+		
+		JTextField genreTF = new JTextField("",15);
+		JPanel panel4 = new JPanel();
+		panel4.add(genreTF);
+		center.add(panel4);
+		
+		JPanel panel5 = new JPanel();
+		JLabel image = new JLabel("Image: ");
+		panel5.add(image);
+		center.add(panel5);
+		
+		JPanel panel6 = new JPanel();
+		JTextField imageTF = new JTextField("null", 15);
+		panel6.add(imageTF);
+		center.add(panel6);
+		
+		JPanel panel7 = new JPanel();
+		JLabel description = new JLabel("Description: ");
+		panel7.add(description);
+		center.add(panel7);
+		
+		JPanel panel8 = new JPanel();
+		JTextField descriptionTF = new JTextField("", 15);
+		panel8.add(descriptionTF);
+		center.add(panel8);
+		
+		JPanel panel9 = new JPanel();
+		JLabel background = new JLabel("Background: ");
+		panel9.add(background);
+		center.add(panel9);
+		
+		JPanel panel10 = new JPanel();
+		JTextField backgroundTF = new JTextField("", 15);
+		panel10.add(backgroundTF);
+		center.add(panel10);
+
+		
+		
+		JButton add = new JButton("Add artist!");
+		south.add(add);
+		
+		add.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				String name = nameTF.getText();
+				String genre = genreTF.getText();
+				String image = imageTF.getText();
+				String description = descriptionTF.getText();
+				String background = backgroundTF.getText();
+				
+				boolean alreadyExists = false;
+				for (Artist artist : agenda.getArtists())
+				{
+					if (artist.getName().equals(name))
+					{
+						alreadyExists = true;
+					}
+				}
+				if (name.isEmpty() == true){
+					JOptionPane.showMessageDialog(null, "Fill in a correct name!");
+				}
+				else if (alreadyExists == false)
+				{
+				Artist a = new Artist(name,genre,image,description, background);
+				agenda.addArtist(a);
+				JOptionPane.showMessageDialog(null, "Artist added!");
+				setVisible(false);
+				dispose();
+				Window.updatePanel();
+				} else {
+					JOptionPane.showMessageDialog(null, "Choose a different artist name!");
+				}
+				
+			}
+		});
+		
+		
+		setContentPane(content);
+		setVisible(true);
+		setSize(500,320);
+	}
+
+}
diff --git a/Agenda/AddEventPanel.java b/Agenda/AddEventPanel.java
new file mode 100644
index 0000000..4d439aa
--- /dev/null
+++ b/Agenda/AddEventPanel.java
@@ -0,0 +1,308 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.GregorianCalendar;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+
+
+public class AddEventPanel extends JFrame{
+
+	private static final long serialVersionUID = 1;
+
+	public AddEventPanel(Agenda agenda)
+	{
+		super("Event addscreen!");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		JPanel content = new JPanel(new BorderLayout());
+		JPanel south = new JPanel(new FlowLayout());
+		JPanel center = new JPanel(new GridLayout(7,2));
+		content.add(south, BorderLayout.SOUTH);
+		content.add(center, BorderLayout.CENTER);
+		
+		GregorianCalendar today = new GregorianCalendar();
+		
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Event name: ");
+		panel1.add(name);
+		center.add(panel1);
+		
+		JPanel panel2 = new JPanel();
+		JTextField nameTF = new JTextField("",15);
+		panel2.add(nameTF);
+		center.add(panel2);
+		
+		JLabel starttime = new JLabel("Starttime: ");
+		JPanel panel3 = new JPanel();
+		panel3.add(starttime);
+		center.add(panel3);
+		
+		Integer[] hours = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 };
+		JComboBox<Integer> hour = new JComboBox<Integer>(hours);
+		hour.setSelectedIndex(today.get(GregorianCalendar.HOUR_OF_DAY));
+		JPanel panel4 = new JPanel();
+		panel4.add(hour);
+		center.add(panel4);
+		
+		Integer[] minutes = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59};
+		JComboBox<Integer> minute = new JComboBox<Integer>(minutes);
+		minute.setSelectedIndex(today.get(GregorianCalendar.MINUTE));
+		panel4.add(minute);
+		panel4.add(new JSeparator(SwingConstants.VERTICAL));
+		panel4.add(new JSeparator(SwingConstants.VERTICAL));
+		
+		
+		Integer[] days = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31};
+		JComboBox<Integer> day = new JComboBox<Integer>(days);
+		day.setSelectedIndex(today.get(GregorianCalendar.DAY_OF_MONTH) - 1);
+		panel4.add(day);
+		
+		String[] months = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
+		JComboBox<String> month = new JComboBox<String>(months);
+		month.setSelectedIndex(today.get(GregorianCalendar.MONTH));
+		panel4.add(month);
+		
+		
+		Integer[] years = { 2015,2016,2017,2018};
+		JComboBox<Integer> year = new JComboBox<Integer>(years);
+		panel4.add(year);
+		
+		
+		
+		JPanel panel5 = new JPanel();
+		JLabel endtime = new JLabel("Endtime: ");
+		panel5.add(endtime);
+		center.add(panel5);
+		
+		JComboBox<Integer> hourE = new JComboBox<Integer>(hours);
+		hourE.setSelectedIndex(today.get(GregorianCalendar.HOUR_OF_DAY));
+		JPanel panel6 = new JPanel();
+		panel6.add(hourE);
+		center.add(panel6);
+		
+		JComboBox<Integer> minuteE = new JComboBox<Integer>(minutes);
+		minuteE.setSelectedIndex(today.get(GregorianCalendar.MINUTE));
+		panel6.add(minuteE);
+		panel6.add(new JSeparator(SwingConstants.VERTICAL));
+		panel6.add(new JSeparator(SwingConstants.VERTICAL));
+		
+		
+		JComboBox<Integer> dayE = new JComboBox<Integer>(days);
+		dayE.setSelectedIndex(today.get(GregorianCalendar.DAY_OF_MONTH) - 1);
+		panel6.add(dayE);
+		
+		JComboBox<String> monthE = new JComboBox<String>(months);
+		monthE.setSelectedIndex(today.get(GregorianCalendar.MONTH));
+		panel6.add(monthE);
+		
+		
+		JComboBox<Integer> yearE = new JComboBox<Integer>(years);
+		panel6.add(yearE);	
+		
+		
+		JPanel panel7 = new JPanel();
+		JLabel artist2 = new JLabel("Artist: ");
+		panel7.add(artist2);
+		center.add(panel7);
+		
+		JPanel panel8 = new JPanel();
+		String[] artists = new String[agenda.getArtists().size()];
+		
+		for ( int idx = 0; idx < agenda.getArtists().size(); idx ++)
+		{
+			artists[idx] = agenda.getArtists().get(idx).getName();
+		}
+		
+		JComboBox<String> artist = new JComboBox<String>(artists);
+		panel8.add(artist);
+		center.add(panel8);
+		
+		JPanel panel9 = new JPanel();
+		JLabel stage = new JLabel("Stage: ");
+		panel9.add(stage);
+		center.add(panel9);
+		
+		JPanel panel10 = new JPanel();
+		String[] stages = new String[agenda.getStages().size()];
+		
+		for ( int idx = 0; idx < agenda.getStages().size(); idx ++)
+		{
+			stages[idx] = agenda.getStages().get(idx).getName();
+		}
+		
+		JComboBox<String> stage2 = new JComboBox<String>(stages);
+		panel10.add(stage2);
+		center.add(panel10);
+		
+		JPanel panel11 = new JPanel();
+		JLabel description = new JLabel("Description: ");
+		panel11.add(description);
+		center.add(panel11);
+		
+		JPanel panel12 = new JPanel();
+		JTextField descriptionTF = new JTextField("",15);
+		panel12.add(descriptionTF);
+		center.add(panel12);
+		
+		JPanel panel13 = new JPanel();
+		JLabel expectedPopularity = new JLabel("Expected Popularity: ");
+		panel13.add(expectedPopularity);
+		center.add(panel13);
+		
+		JPanel panel14 = new JPanel();
+		Integer[] eps= { 1,2,3,4,5,6,7,8,9,10}; 
+		JComboBox<Integer> ep = new JComboBox<Integer>(eps);
+		panel14.add(ep);
+		center.add(panel14);
+		
+		
+
+		
+		
+		JButton add = new JButton("Add event!");
+		south.add(add);
+		
+		add.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				boolean everythingCorrect = true;
+				String name = nameTF.getText();
+				
+				int hourS = hour.getSelectedIndex();
+				int minuteS = minute.getSelectedIndex();
+				int dayS = day.getSelectedIndex() + 1;
+				String monthS = (String) month.getSelectedItem();
+				int yearS = year.getSelectedIndex() + 2015;
+				
+				int hourEnd = hourE.getSelectedIndex();
+				int minuteEnd = minuteE.getSelectedIndex();
+				int dayEnd = dayE.getSelectedIndex() + 1;
+				String monthEnd = (String) monthE.getSelectedItem();
+				int yearEnd = yearE.getSelectedIndex() + 2015;
+				
+				String artistName = (String)artist.getSelectedItem();
+				
+				Artist artist = null;
+				
+				for(Artist a : agenda.getArtists())
+				{
+					if (a.getName().equals(artistName))
+					{
+						artist = a;
+					}
+				}
+				
+				String stageName = (String)stage2.getSelectedItem();
+				
+				Stage stage = null;
+
+				for(Stage s : agenda.getStages())
+				{
+					if (s.getName().equals(stageName))
+					{
+						stage = s;
+					}
+				}
+				
+				String description = descriptionTF.getText();
+				
+				int popularity = ep.getSelectedIndex() + 1;
+				
+				if (dayS > monthDays(monthS)){
+					everythingCorrect = false;
+					JOptionPane.showMessageDialog(null, "Invalid Date!");
+				}
+				else if (yearS > yearEnd || monthToInt(monthS) > monthToInt(monthEnd) || dayS > dayEnd || hourS > hourEnd || minuteS > minuteEnd){
+					everythingCorrect = false;	
+					JOptionPane.showMessageDialog(null, "End time is earlier then start time!");
+				}
+				else if (dayS != dayEnd || monthS.equals(monthEnd) == false || yearS != yearEnd){
+					everythingCorrect = false;	
+					JOptionPane.showMessageDialog(null, "Event is too long! It can't be longer than a single day.");
+				} else if (name.isEmpty()){
+					everythingCorrect = false;
+					JOptionPane.showMessageDialog(null, "Fill in a correct name!");
+				} else if (stage == null){
+					everythingCorrect = false;
+					JOptionPane.showMessageDialog(null, "Missing a stage!");
+				} else if (artist == null){
+					JOptionPane.showMessageDialog(null, "Missing a artist!");
+				}
+				
+				
+				if (everythingCorrect == true)
+				{
+					Event event = new Event(name,yearS,monthToInt(monthS),dayS,hourS,minuteS,yearEnd,monthToInt(monthEnd),dayEnd,hourEnd, minuteEnd, artist, stage,description, popularity);
+					agenda.addEvent(event);
+					everythingCorrect = false;	
+					JOptionPane.showMessageDialog(null, "Event added!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+				}
+				
+				
+			}
+		});
+		
+		
+		setContentPane(content);
+		setVisible(true);
+		setSize(700,320);
+		
+	}
+	
+	public int monthToInt(String month)
+	{
+		int number = 0;
+		switch (month)
+		{
+		case "January": number = 1; break;
+		case "February": number = 2; break;
+		case "March": number = 3; break;
+		case "April": number = 4; break;
+		case "May": number = 5; break;
+		case "June":number = 6; break;
+		case "July": number = 7; break;
+		case "August": number = 8; break;
+		case "September":number = 9; break;
+		case "October": number = 10; break;
+		case "November": number = 11; break;
+		case "December": number = 12; break;
+		}
+		return number;		
+	}
+	
+	public int monthDays(String month)
+	{
+		int number = 0;
+		switch (month)
+		{
+		case "January": number = 31; break;
+		case "February": number = 28; break;
+		case "March": number = 31; break;
+		case "April": number = 30; break;
+		case "May": number = 31; break;
+		case "June":number = 30; break;
+		case "July": number = 31; break;
+		case "August": number = 31; break;
+		case "September":number = 30; break;
+		case "October": number = 31; break;
+		case "November": number = 30; break;
+		case "December": number = 31; break;
+		}
+		return number;		
+	}
+
+}
diff --git a/Agenda/AddStagePanel.java b/Agenda/AddStagePanel.java
new file mode 100644
index 0000000..d18177e
--- /dev/null
+++ b/Agenda/AddStagePanel.java
@@ -0,0 +1,93 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+
+public class AddStagePanel extends JFrame{
+
+	private static final long serialVersionUID = 1;
+
+	public AddStagePanel(Agenda agenda)
+	{
+		super("Stage addscreen!");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		JPanel content = new JPanel(new BorderLayout());
+		JPanel south = new JPanel(new FlowLayout());
+		JPanel center = new JPanel(new GridLayout(2,2));
+		content.add(south, BorderLayout.SOUTH);
+		content.add(center, BorderLayout.CENTER);
+		
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Stage name: ");
+		panel1.add(name);
+		center.add(panel1);
+		
+		JPanel panel2 = new JPanel();
+		JTextField nameTF = new JTextField("",15);
+		panel2.add(nameTF);
+		center.add(panel2);
+		
+		JLabel description = new JLabel("Stage Description: ");
+		JPanel panel3 = new JPanel();
+		panel3.add(description);
+		center.add(panel3);
+		
+		JTextField descriptionTF = new JTextField("",15);
+		JPanel panel4 = new JPanel();
+		panel4.add(descriptionTF);
+		center.add(panel4);
+		
+		
+		JButton add = new JButton("Add stage!");
+		south.add(add);
+		
+		add.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				String name = nameTF.getText();
+				String description = descriptionTF.getText();
+
+				boolean alreadyExists = false;
+				for (Stage stage : agenda.getStages())
+				{
+					if (stage.getName().equals(name))
+					{
+						alreadyExists = true;
+					}
+				}
+				if (name.isEmpty()){
+					JOptionPane.showMessageDialog(null, "Fill in a correct name!");
+				}
+				else if ( alreadyExists == false )
+				{
+					Stage s = new Stage(name,description);
+					agenda.addStage(s);
+					JOptionPane.showMessageDialog(null, "Stage added!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+				}
+				else {
+					JOptionPane.showMessageDialog(null, "Choose a different stage name!");				
+				}
+				
+			}
+		});
+		
+		
+		setContentPane(content);
+		setVisible(true);
+		setSize(400,180);
+	}
+
+}
diff --git a/Agenda/Agenda.java b/Agenda/Agenda.java
new file mode 100644
index 0000000..199c762
--- /dev/null
+++ b/Agenda/Agenda.java
@@ -0,0 +1,220 @@
+package Agenda;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
+
+public class Agenda implements Serializable {
+
+	private static final long serialVersionUID = 1;
+
+	private ArrayList<Stage> stages;
+	private ArrayList<Event> events;
+	private ArrayList<Artist> artists;
+
+	public Agenda() {
+		stages = new ArrayList<Stage>();
+		events = new ArrayList<Event>();
+		artists = new ArrayList<Artist>();
+	}
+	
+	public void addStage(Stage stage){
+		stages.add(stage);
+	}
+
+	public void addEvent(Event event) {
+		events.add(event);
+	}
+
+	public void addArtist(Artist artist) {
+		artists.add(artist);
+	}
+	
+	public ArrayList<Event> getEvents()
+	{
+		return events;
+	}
+	public ArrayList<Artist> getArtists()
+	{
+		return artists;
+	}
+	public ArrayList<Stage> getStages()
+	{
+		return stages;
+	}
+	
+	public void saveAgenda()
+	{
+		JFileChooser fileChooser = new JFileChooser();
+		
+		fileChooser.setFileFilter(new FileFilter() {
+				@Override
+				public boolean accept(File pathname) {
+					if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+					{
+						return true;
+					}else if(pathname.isDirectory()){return true;}else{return false;}
+				}
+
+				@Override
+				public String getDescription() {
+					return ".agn";
+				}
+			
+		});
+		fileChooser.setDialogTitle("Choose save location");
+		int userSelection = fileChooser.showSaveDialog(null);
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
+		{
+			File file = fileChooser.getSelectedFile();
+			if(!file.getName().endsWith(".agn"))
+			{
+				file = new File(file.getAbsolutePath() + ".agn");
+			}
+			
+			if(file.exists())
+			{
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					saveAgenda(file);
+				}
+			}
+			else
+			{
+				saveAgenda(file);
+			}
+		}
+	}
+	
+	public void loadAgenda()
+	{
+		JFileChooser fileChooser = new JFileChooser();
+		fileChooser.setFileFilter(new FileFilter() {
+			@Override
+			public boolean accept(File pathname) {
+				if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+				{
+					return true;
+				}else if(pathname.isDirectory()){return true;}else{return false;}
+			}
+
+			@Override
+			public String getDescription() {
+				return ".agn";
+			}
+		
+		});
+		
+		fileChooser.setDialogTitle("Choose file");
+		int userSelection = fileChooser.showOpenDialog(null);
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
+		{
+			File file = fileChooser.getSelectedFile();
+			if(!file.exists())
+			{
+				JOptionPane.showMessageDialog(null, "This file does not exist: " + file.getName());
+			}
+			else
+			{
+				clearAgenda();
+				fillAgenda(file);
+				JOptionPane.showMessageDialog(null, "Loaded succesfully");
+			}
+		}
+		}
+
+	public void fillAgenda(File file) {
+		FileInputStream fis = null;
+		ObjectInputStream ois = null;
+
+		try {
+			
+			fis = new FileInputStream(file);
+			ois = new ObjectInputStream(fis);
+
+			Object object;
+			object = ois.readObject();
+			Agenda a = (Agenda) object; 
+			events = a.getEvents();
+			stages = a.getStages();
+			artists = a.getArtists();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+	
+	public void fillArtists()
+	{
+		for (Event e : events)
+		{
+			boolean exists = false;
+			String name = e.getArtist().getName();
+			for (Artist a : artists)
+			{
+				if ( a.getName().equals(name) ) {
+					exists = true;
+				}
+			}
+			if ( exists == false) {
+				addArtist(e.getArtist());
+			}
+		}
+	}
+	
+	public void fillStages()
+	{
+		for (Event e : events)
+		{
+			boolean exists = false;
+			String name = e.getStage().getName();
+			for (Stage s : stages)
+			{
+				if ( s.getName().equals(name) ) {
+					exists = true;
+				}
+			}
+			if ( exists == false) {
+				addStage(e.getStage());
+			}
+		}
+	}
+
+	public void saveAgenda(File file) {
+
+		try {
+			FileOutputStream fos = new FileOutputStream(file);
+			ObjectOutputStream oos = new ObjectOutputStream(fos);
+			oos.writeObject(this);
+			oos.close();
+			JOptionPane.showMessageDialog(null, "Saved succesfully");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}		
+	
+	public void clearAgenda()
+	{
+		events.clear();
+		stages.clear();
+		artists.clear();
+	}	
+	
+	public void fillAllLists()
+	{
+		loadAgenda();
+		fillStages();
+		fillArtists();
+	}
+}
diff --git a/Agenda/Artist.java b/Agenda/Artist.java
new file mode 100644
index 0000000..541c04e
--- /dev/null
+++ b/Agenda/Artist.java
@@ -0,0 +1,88 @@
+package Agenda;
+import java.io.Serializable;
+
+import javax.swing.ImageIcon;
+
+
+public class Artist implements Serializable{
+
+	private static final long serialVersionUID = 1;
+	
+	private String name;
+	private String genre;
+	private ImageIcon image;
+	private String description;
+	private String background;
+	
+	public Artist(String name, String genre, String image, String description, String background)
+	{
+		this.name = name;
+		this.genre = genre;
+		this.description = description;
+		this.background = background;
+		
+		if ( !image.equals("null")) {
+			this.image = new ImageIcon(image);
+		} 
+	}
+	
+	public String getName()
+	{
+		return this.name;
+	}
+	
+	public String getGenre()
+	{
+		return this.genre;
+	}
+	
+	public ImageIcon getImage()
+	{
+		return this.image;
+	}
+	
+	public String getDescription()
+	{
+		return this.description;
+	}
+	
+	public String getBackground()
+	{
+		return this.background;
+	}
+	
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+	
+	public void setGenre(String genre)
+	{
+		this.genre = genre;
+	}
+	
+	public void setImageIconString(String image)
+	{
+		this.image = new ImageIcon(image);
+	}
+	
+	public void setImageIcon(ImageIcon image)
+	{
+		this.image = image;
+	}
+	
+	public void setDescription(String description)
+	{
+		this.description = description;
+	}
+	
+	public void setBackground(String background)
+	{
+		this.background = background;
+	}
+	
+	public String toString()
+	{
+		return name;
+	}
+}
diff --git a/Agenda/ArtistPanel.java b/Agenda/ArtistPanel.java
new file mode 100644
index 0000000..baa3b08
--- /dev/null
+++ b/Agenda/ArtistPanel.java
@@ -0,0 +1,51 @@
+package Agenda;
+
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+
+public class ArtistPanel extends JPanel{
+
+	public ArtistPanel(Event event, Agenda a, TabbedPane tab)
+	{
+		super(new BorderLayout());
+		JLabel name = new JLabel(event.getArtist().getName());
+		JButton edit = new JButton("Edit Info");
+		edit.addActionListener(new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				EditArtistPanel editter = new EditArtistPanel(a, event.getArtist(), tab);
+			}
+		});
+		name.setFont(new Font("Dialog", Font.BOLD, 20));
+		JLabel description = new JLabel("<html>" + " <b> Genre: </b> " + event.getArtist().getGenre() + "<br> <br> <b> Beschrijving </b> <br> <br>" + event.getArtist().getDescription() + " <br> <br> <b> achtergrondinfo </b> <br> <br>" + event.getArtist().getBackground() + "</html>");
+		description.setFont(new Font("Dialog", Font.PLAIN, 12));
+		JPanel panel = new JPanel();
+		panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
+		JPanel panel2 = new JPanel();
+		panel2.setLayout(new BoxLayout(panel2, BoxLayout.LINE_AXIS));
+		panel2.setAlignmentX(LEFT_ALIGNMENT);
+		JLabel photo = new JLabel(event.getArtist().getImage());
+		panel2.add(name);
+		panel2.add(Box.createRigidArea(new Dimension(10,0)));
+		panel2.add(edit);
+		panel.add(panel2);
+		panel.add(new JSeparator(SwingConstants.HORIZONTAL));
+		add(photo, BorderLayout.EAST);
+		add(description, BorderLayout.CENTER);
+		add(panel, BorderLayout.NORTH);
+	}
+	
+}
diff --git a/Agenda/ContentList.java b/Agenda/ContentList.java
new file mode 100644
index 0000000..03dbd33
--- /dev/null
+++ b/Agenda/ContentList.java
@@ -0,0 +1,26 @@
+package Agenda;
+import javax.swing.AbstractListModel;
+
+
+public class ContentList extends AbstractListModel {
+
+	private static final long serialVersionUID = 9110016552017561529L;
+	
+	Object[] data;
+	
+	public ContentList(Object[] data)
+	{
+		this.data = data;
+	}
+	
+	@Override
+	public Object getElementAt(int arg0) {
+		return data[arg0];
+	}
+
+	@Override
+	public int getSize() {
+		return data.length;
+	}
+
+}
diff --git a/Agenda/ContentTable.java b/Agenda/ContentTable.java
new file mode 100644
index 0000000..cb3c97a
--- /dev/null
+++ b/Agenda/ContentTable.java
@@ -0,0 +1,41 @@
+package Agenda;
+import javax.swing.table.AbstractTableModel;
+
+/**
+ * This class is used to make a temporary abstracttableModel with selected data so later it can be passed to the JTable so it refreshes.
+ * @author Wesley
+ * @version 1.0
+ */
+public class ContentTable extends AbstractTableModel {
+
+	private static final long serialVersionUID = 1L;
+
+	private Object[][] data;
+	private String[] columnNames;
+	
+	
+	public ContentTable(Object[][] data,String[] columnNames) {
+		this.data = data;
+		this.columnNames = columnNames;
+	}
+
+	@Override
+	public int getColumnCount() {
+		return columnNames.length;
+	}
+
+	@Override
+	public int getRowCount() {
+		return data.length;
+	}
+
+	@Override
+	public Object getValueAt(int rowIndex, int columnIndex) {
+		return data[rowIndex][columnIndex];
+	}
+	
+	@Override
+	public String getColumnName(int col) {
+        return columnNames[col];
+    }	
+}
diff --git a/Agenda/EditArtistPanel.java b/Agenda/EditArtistPanel.java
new file mode 100644
index 0000000..fb78abe
--- /dev/null
+++ b/Agenda/EditArtistPanel.java
@@ -0,0 +1,182 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+public class EditArtistPanel extends JFrame {
+
+	private static final long serialVersionUID = 1;
+
+	public EditArtistPanel(Agenda agenda, Artist art, TabbedPane tab)
+	{
+		super("Artist editscreen!");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		JPanel content = new JPanel(new BorderLayout());
+		JPanel south = new JPanel(new FlowLayout());
+		JPanel center = new JPanel(new GridLayout(5,2));
+		content.add(south, BorderLayout.SOUTH);
+		content.add(center, BorderLayout.CENTER);
+		
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Artist name: ");
+		panel1.add(name);
+		center.add(panel1);
+		
+		JPanel panel2 = new JPanel();
+		JTextField nameTF = new JTextField(art.getName(),15);
+		panel2.add(nameTF);
+		center.add(panel2);
+		
+		JLabel genre = new JLabel("Genre: ");
+		JPanel panel3 = new JPanel();
+		panel3.add(genre);
+		center.add(panel3);
+		
+		JTextField genreTF = new JTextField(art.getGenre(),15);
+		JPanel panel4 = new JPanel();
+		panel4.add(genreTF);
+		center.add(panel4);
+		
+		JPanel panel5 = new JPanel();
+		JLabel image = new JLabel("Image: ");
+		panel5.add(image);
+		center.add(panel5);
+		
+		JPanel panel6 = new JPanel();
+		JTextField imageTF = new JTextField("null", 15);
+		panel6.add(imageTF);
+		center.add(panel6);
+		
+		JPanel panel7 = new JPanel();
+		JLabel description = new JLabel("Description: ");
+		panel7.add(description);
+		center.add(panel7);
+		
+		JPanel panel8 = new JPanel();
+		JTextField descriptionTF = new JTextField(art.getDescription(), 15);
+		panel8.add(descriptionTF);
+		center.add(panel8);
+
+		JPanel panel9 = new JPanel();
+		JLabel background = new JLabel("Background: ");
+		panel9.add(background);
+		center.add(panel9);
+		
+		JPanel panel10 = new JPanel();
+		JTextField backgroundTF = new JTextField(art.getBackground(), 15);
+		panel10.add(backgroundTF);
+		center.add(panel10);
+
+		
+		
+		JButton edit = new JButton("Edit artist!");
+		south.add(edit);
+		
+		edit.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				String name = nameTF.getText();
+				String genre = genreTF.getText();
+				String image = imageTF.getText();
+				String description = descriptionTF.getText();
+				String background = backgroundTF.getText();
+				
+				boolean alreadyExists = false;
+				for (Artist artist : agenda.getArtists())
+				{
+					if (artist.getName().equals(name) && !artist.equals(art))
+					{
+						alreadyExists = true;
+					}
+				}
+				if (name.isEmpty() == true){
+					JOptionPane.showMessageDialog(null, "Fill in a correct name!");
+				}
+				else if (alreadyExists == false)
+				{
+					art.setName(name);
+					art.setGenre(genre);
+					art.setImageIconString(image);
+					art.setDescription(description);
+					art.setBackground(background);
+					JOptionPane.showMessageDialog(null, "Artist edited!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+					if(tab != null)
+					{
+					tab.setVisible(false);
+					tab.dispose();
+					Event eventartist = null;
+					for(Event event: agenda.getEvents())
+					{
+						if (event.getArtist().getName().equals(name))
+						{
+							eventartist = event;
+						}
+					}
+					TabbedPane panel = new TabbedPane(agenda, eventartist, false);
+					}
+				} else {
+					JOptionPane.showMessageDialog(null, "Choose a different artist name!");
+				}
+				
+			}
+		});
+		
+		JButton remove = new JButton("Remove artist!");
+		for(Event e : agenda.getEvents())
+		{
+			if(e.getArtist().equals(art))
+			{
+				remove.setEnabled(false);
+			}
+		}
+		south.add(remove);
+		
+		remove.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to remove this artist?", "Remove Artist", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					Iterator<Artist> it = agenda.getArtists().iterator();
+					while(it.hasNext())
+					{
+						Artist a = it.next();
+						if(a.equals(art))
+						{
+							it.remove();
+						}
+					}
+					
+					JOptionPane.showMessageDialog(null, "Artist removed!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+					if(tab != null)
+					{
+					tab.setVisible(false);
+					tab.dispose();
+					}
+				}
+			}
+		});
+		
+		
+		setContentPane(content);
+		setVisible(true);
+		setSize(500,320);
+	}
+	
+}
diff --git a/Agenda/EditEventPanel.java b/Agenda/EditEventPanel.java
new file mode 100644
index 0000000..4133503
--- /dev/null
+++ b/Agenda/EditEventPanel.java
@@ -0,0 +1,376 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+
+
+public class EditEventPanel extends JFrame{
+
+	private static final long serialVersionUID = 1;
+
+	public EditEventPanel(Agenda agenda, Event e, TabbedPane tab)
+	{
+		super("Event editscreen!");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		JPanel content = new JPanel(new BorderLayout());
+		JPanel south = new JPanel(new FlowLayout());
+		JPanel center = new JPanel(new GridLayout(7,2));
+		content.add(south, BorderLayout.SOUTH);
+		content.add(center, BorderLayout.CENTER);
+		
+		
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Event name: ");
+		panel1.add(name);
+		center.add(panel1);
+		
+		JPanel panel2 = new JPanel();
+		JTextField nameTF = new JTextField(e.getEventName(),15);
+		panel2.add(nameTF);
+		center.add(panel2);
+		
+		JLabel starttime = new JLabel("Starttime: ");
+		JPanel panel3 = new JPanel();
+		panel3.add(starttime);
+		center.add(panel3);
+		
+		Integer[] hours = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 };
+		JComboBox<Integer> hour = new JComboBox<Integer>(hours);
+		hour.setSelectedIndex(e.getStartDate().get(GregorianCalendar.HOUR_OF_DAY));
+		JPanel panel4 = new JPanel();
+		panel4.add(hour);
+		center.add(panel4);
+		
+		Integer[] minutes = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59};
+		JComboBox<Integer> minute = new JComboBox<Integer>(minutes);
+		minute.setSelectedIndex(e.getStartDate().get(GregorianCalendar.MINUTE));
+		panel4.add(minute);
+		panel4.add(new JSeparator(SwingConstants.VERTICAL));
+		panel4.add(new JSeparator(SwingConstants.VERTICAL));
+		
+		
+		Integer[] days = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31};
+		JComboBox<Integer> day = new JComboBox<Integer>(days);
+		day.setSelectedIndex(e.getStartDate().get(GregorianCalendar.DAY_OF_MONTH) - 1);
+		panel4.add(day);
+		
+		String[] months = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
+		JComboBox<String> month = new JComboBox<String>(months);
+		month.setSelectedIndex(e.getStartDate().get(GregorianCalendar.MONTH));
+		panel4.add(month);
+		
+		
+		Integer[] years = { 2015,2016,2017,2018};
+		JComboBox<Integer> year = new JComboBox<Integer>(years);
+		year.setSelectedItem(e.getStartDate().get(GregorianCalendar.YEAR));
+		panel4.add(year);
+		
+		
+		
+		JPanel panel5 = new JPanel();
+		JLabel endtime = new JLabel("Endtime: ");
+		panel5.add(endtime);
+		center.add(panel5);
+		
+		JComboBox<Integer> hourE = new JComboBox<Integer>(hours);
+		hourE.setSelectedIndex(e.getEndDate().get(GregorianCalendar.HOUR_OF_DAY));
+		JPanel panel6 = new JPanel();
+		panel6.add(hourE);
+		center.add(panel6);
+		
+		JComboBox<Integer> minuteE = new JComboBox<Integer>(minutes);
+		minuteE.setSelectedIndex(e.getEndDate().get(GregorianCalendar.MINUTE));
+		panel6.add(minuteE);
+		panel6.add(new JSeparator(SwingConstants.VERTICAL));
+		panel6.add(new JSeparator(SwingConstants.VERTICAL));
+		
+		
+		JComboBox<Integer> dayE = new JComboBox<Integer>(days);
+		dayE.setSelectedIndex(e.getEndDate().get(GregorianCalendar.DAY_OF_MONTH) - 1);
+		panel6.add(dayE);
+		
+		JComboBox<String> monthE = new JComboBox<String>(months);
+		monthE.setSelectedIndex(e.getEndDate().get(GregorianCalendar.MONTH));
+		panel6.add(monthE);
+		
+		
+		JComboBox<Integer> yearE = new JComboBox<Integer>(years);
+		yearE.setSelectedItem(e.getEndDate().get(GregorianCalendar.YEAR));
+		panel6.add(yearE);	
+		
+		
+		JPanel panel7 = new JPanel();
+		JLabel artist2 = new JLabel("Artist: ");
+		panel7.add(artist2);
+		center.add(panel7);
+		
+		JPanel panel8 = new JPanel();
+		String[] artists = new String[agenda.getArtists().size()];
+		int artistIndex = 0;
+		
+		for ( int idx = 0; idx < agenda.getArtists().size(); idx ++)
+		{
+			artists[idx] = agenda.getArtists().get(idx).getName();
+			if(agenda.getArtists().get(idx).equals(e.getArtist()))
+			{
+				artistIndex = idx;
+			}
+		}
+		
+		JComboBox<String> artist = new JComboBox<String>(artists);
+		artist.setSelectedIndex(artistIndex);
+		panel8.add(artist);
+		center.add(panel8);
+		
+		JPanel panel9 = new JPanel();
+		JLabel stage = new JLabel("Stage: ");
+		panel9.add(stage);
+		center.add(panel9);
+		
+		JPanel panel10 = new JPanel();
+		String[] stages = new String[agenda.getStages().size()];
+		
+		int stageIndex = 0;
+		
+		for ( int idx = 0; idx < agenda.getStages().size(); idx ++)
+		{
+			stages[idx] = agenda.getStages().get(idx).getName();
+			if(agenda.getStages().get(idx).equals(e.getStage()))
+			{
+				stageIndex = idx;
+			}
+		}
+		
+		JComboBox<String> stage2 = new JComboBox<String>(stages);
+		stage2.setSelectedIndex(stageIndex);
+		panel10.add(stage2);
+		center.add(panel10);
+		
+		JPanel panel11 = new JPanel();
+		JLabel description = new JLabel("Description: ");
+		panel11.add(description);
+		center.add(panel11);
+		
+		JPanel panel12 = new JPanel();
+		JTextField descriptionTF = new JTextField(e.getDescription(),15);
+		panel12.add(descriptionTF);
+		center.add(panel12);
+		
+		JPanel panel13 = new JPanel();
+		JLabel expectedPopularity = new JLabel("Expected Popularity: ");
+		panel13.add(expectedPopularity);
+		center.add(panel13);
+		
+		JPanel panel14 = new JPanel();
+		Integer[] eps= { 1,2,3,4,5,6,7,8,9,10}; 
+		JComboBox<Integer> ep = new JComboBox<Integer>(eps);
+		ep.setSelectedIndex(e.getExpectedPopularity() - 1);
+		panel14.add(ep);
+		center.add(panel14);
+		
+		
+
+		
+		
+		JButton add = new JButton("Edit event!");
+		south.add(add);
+		
+		add.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent f) {
+				boolean everythingCorrect = true;
+				String name = nameTF.getText();
+				
+				int hourS = hour.getSelectedIndex();
+				int minuteS = minute.getSelectedIndex();
+				int dayS = day.getSelectedIndex() + 1;
+				String monthS = (String) month.getSelectedItem();
+				int yearS = year.getSelectedIndex() + 2015;
+				
+				int hourEnd = hourE.getSelectedIndex();
+				int minuteEnd = minuteE.getSelectedIndex();
+				int dayEnd = dayE.getSelectedIndex() + 1;
+				String monthEnd = (String) monthE.getSelectedItem();
+				int yearEnd = yearE.getSelectedIndex() + 2015;
+				
+				String artistName = (String)artist.getSelectedItem();
+				
+				Artist artist = null;
+				
+				for(Artist a : agenda.getArtists())
+				{
+					if (a.getName().equals(artistName))
+					{
+						artist = a;
+					}
+				}
+				
+				String stageName = (String)stage2.getSelectedItem();
+				
+				Stage stage = null;
+
+				for(Stage s : agenda.getStages())
+				{
+					if (s.getName().equals(stageName))
+					{
+						stage = s;
+					}
+				}
+				
+				String description = descriptionTF.getText();
+				
+				int popularity = ep.getSelectedIndex() + 1;
+				
+				if (dayS > monthDays(monthS)){
+					everythingCorrect = false;
+					JOptionPane.showMessageDialog(null, "Invalid Date!");
+				}
+				else if (yearS > yearEnd || monthToInt(monthS) > monthToInt(monthEnd) || dayS > dayEnd || hourS > hourEnd || minuteS > minuteEnd){
+					everythingCorrect = false;	
+					JOptionPane.showMessageDialog(null, "End time is earlier then start time!");
+				}
+				else if (dayS != dayEnd || monthS.equals(monthEnd) == false || yearS != yearEnd){
+					everythingCorrect = false;	
+					JOptionPane.showMessageDialog(null, "Event is too long! It can't be longer than a single day.");
+				} else if (name.isEmpty()){
+					everythingCorrect = false;
+					JOptionPane.showMessageDialog(null, "Fill in a correct name!");
+				} else if (stage == null){
+					everythingCorrect = false;
+					JOptionPane.showMessageDialog(null, "Missing a stage!");
+				} else if (artist == null){
+					JOptionPane.showMessageDialog(null, "Missing a artist!");
+				}
+				
+				
+				if (everythingCorrect == true)
+				{
+					e.setEventName(name);
+					e.setDescription(description);
+					e.setExpectedPopularity(popularity);
+					e.setArtist(artist);
+					e.setStage(stage);
+					e.setStartDate(yearS, monthToInt(monthS), dayS, hourS, minuteS);
+					e.setEndDate(yearEnd, monthToInt(monthEnd), dayEnd, hourEnd, minuteEnd);
+					
+					everythingCorrect = false;	
+					JOptionPane.showMessageDialog(null, "Event edited!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+					if(tab != null)
+					{
+					tab.setVisible(false);
+					tab.dispose();
+					Event eventartist = null;
+					for(Event event: agenda.getEvents())
+					{
+						if (event.getEventName().equals(name))
+						{
+							eventartist = event;
+						}
+					}
+					TabbedPane panel = new TabbedPane(agenda, eventartist, true);
+					}
+				}
+				
+				
+			}
+		});
+		
+		JButton remove = new JButton("Remove event!");
+		south.add(remove);
+		
+		remove.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent f) {
+				
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to remove this event?", "Remove Event", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					Iterator<Event> it = agenda.getEvents().iterator();
+					while(it.hasNext())
+					{
+						Event ev = it.next();
+						if(ev.equals(e))
+						{
+							it.remove();
+						}
+					}
+					
+					JOptionPane.showMessageDialog(null, "Event removed!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+					if(tab != null)
+					{
+						tab.setVisible(false);
+						tab.dispose();
+					}
+				}
+			}
+		});
+		
+		
+		setContentPane(content);
+		setVisible(true);
+		setSize(700,320);
+	}
+	
+	public int monthToInt(String month)
+	{
+		int number = 0;
+		switch (month)
+		{
+		case "January": number = 1; break;
+		case "February": number = 2; break;
+		case "March": number = 3; break;
+		case "April": number = 4; break;
+		case "May": number = 5; break;
+		case "June":number = 6; break;
+		case "July": number = 7; break;
+		case "August": number = 8; break;
+		case "September":number = 9; break;
+		case "October": number = 10; break;
+		case "November": number = 11; break;
+		case "December": number = 12; break;
+		}
+		return number;		
+	}
+	
+	public int monthDays(String month)
+	{
+		int number = 0;
+		switch (month)
+		{
+		case "January": number = 31; break;
+		case "February": number = 28; break;
+		case "March": number = 31; break;
+		case "April": number = 30; break;
+		case "May": number = 31; break;
+		case "June":number = 30; break;
+		case "July": number = 31; break;
+		case "August": number = 31; break;
+		case "September":number = 30; break;
+		case "October": number = 31; break;
+		case "November": number = 30; break;
+		case "December": number = 31; break;
+		}
+		return number;		
+	}
+	
+
+}
diff --git a/Agenda/EditStagePanel.java b/Agenda/EditStagePanel.java
new file mode 100644
index 0000000..cf62338
--- /dev/null
+++ b/Agenda/EditStagePanel.java
@@ -0,0 +1,128 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+
+public class EditStagePanel extends JFrame{
+
+	private static final long serialVersionUID = 1;
+
+	public EditStagePanel(Agenda agenda, Stage sta)
+	{
+		super("Stage editscreen!");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		JPanel content = new JPanel(new BorderLayout());
+		JPanel south = new JPanel(new FlowLayout());
+		JPanel center = new JPanel(new GridLayout(2,2));
+		content.add(south, BorderLayout.SOUTH);
+		content.add(center, BorderLayout.CENTER);
+		
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Stage name: ");
+		panel1.add(name);
+		center.add(panel1);
+		
+		JPanel panel2 = new JPanel();
+		JTextField nameTF = new JTextField(sta.getName(),15);
+		panel2.add(nameTF);
+		center.add(panel2);
+		
+		JLabel description = new JLabel("Stage Description: ");
+		JPanel panel3 = new JPanel();
+		panel3.add(description);
+		center.add(panel3);
+		
+		JTextField descriptionTF = new JTextField(sta.getDescription(),15);
+		JPanel panel4 = new JPanel();
+		panel4.add(descriptionTF);
+		center.add(panel4);
+		
+		
+		JButton add = new JButton("Edit stage!");
+		south.add(add);
+		
+		add.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				String name = nameTF.getText();
+				String description = descriptionTF.getText();
+
+				boolean alreadyExists = false;
+				for (Stage stage : agenda.getStages())
+				{
+					if (stage.getName().equals(name)  && !stage.equals(sta))
+					{
+						alreadyExists = true;
+					}
+				}
+				if (name.isEmpty()){
+					JOptionPane.showMessageDialog(null, "Fill in a correct name!");
+				}
+				else if ( alreadyExists == false )
+				{
+					sta.setName(name);
+					sta.setDescription(description);
+					JOptionPane.showMessageDialog(null, "Stage edited!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+				}
+				else {
+					JOptionPane.showMessageDialog(null, "Choose a different stage name!");				
+				}
+				
+			}
+		});
+		
+		JButton remove = new JButton("Remove stage!");
+		for(Event e : agenda.getEvents())
+		{
+			if(e.getStage().equals(sta))
+			{
+				remove.setEnabled(false);
+			}
+		}
+		south.add(remove);
+		
+		remove.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e) {
+				
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to remove this stage?", "Remove Stage", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					Iterator<Stage> it = agenda.getStages().iterator();
+					while(it.hasNext())
+					{
+						Stage s = it.next();
+						if(s.equals(sta))
+						{
+							it.remove();
+						}
+					}
+					
+					JOptionPane.showMessageDialog(null, "Stage removed!");
+					setVisible(false);
+					dispose();
+					Window.updatePanel();
+				}
+			}
+		});
+		
+		
+		setContentPane(content);
+		setVisible(true);
+		setSize(400,180);
+	}
+
+}
diff --git a/Agenda/Event.java b/Agenda/Event.java
new file mode 100644
index 0000000..cc89824
--- /dev/null
+++ b/Agenda/Event.java
@@ -0,0 +1,211 @@
+package Agenda;
+
+
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+public class Event implements Serializable {
+
+	private static final long serialVersionUID = 1;
+
+	private String eventName;
+	private GregorianCalendar startDate;
+	private GregorianCalendar endDate;
+	private int startHour;
+	private int startMinute;
+	private int stopHour;
+	private int stopMinute;
+	private Artist artist;
+	private Stage stage;
+	private String description;
+	private int expectedPopularity;
+
+	public Event(String eventName, int startYear, int startMonth, int startDay,
+			int startHour, int startMinute, int endYear, int endMonth,
+			int endDay, int endHour, int endMinute, Artist artist, Stage stage,
+			String description, int expectedPopularity) {
+		this.eventName = eventName;
+		this.startDate = new GregorianCalendar(startYear, startMonth - 1,
+				startDay, startHour, startMinute);
+		this.endDate = new GregorianCalendar(endYear, endMonth - 1, endDay,
+				endHour, endMinute);
+		this.startHour = startHour;
+		this.startMinute = startMinute;
+		this.stopHour = stopHour;
+		this.stopMinute = stopMinute;
+		this.stage = stage;
+		this.artist = artist;
+		this.description = description;
+		this.expectedPopularity = expectedPopularity;
+	}
+
+	public Event(String eventName, GregorianCalendar startDate,
+			GregorianCalendar endDate, Artist artist, Stage stage,
+			String description, int expectedPopularity) {
+		this.eventName = eventName;
+		this.startDate = startDate;
+		this.endDate = endDate;
+		this.artist = artist;
+		this.stage = stage;
+		this.description = description;
+		this.expectedPopularity = expectedPopularity;
+	}
+	
+	public int getStart(){
+		return (startHour * 100) + startMinute;
+	}
+	
+	public int getStop(){
+		return (stopHour * 100) + stopMinute;
+	}
+	
+	public int getStopHour(){
+		return this.stopHour;
+	}
+
+	public String getEventName() {
+		return this.eventName;
+	}
+
+	public GregorianCalendar getStartDate() {
+		return this.startDate;
+	}
+
+	public GregorianCalendar getEndDate() {
+		return this.endDate;
+	}
+
+	public Artist getArtist() {
+		return this.artist;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	public Stage getStage() {
+		return this.stage;
+	}
+
+	public int getExpectedPopularity() {
+		return this.expectedPopularity;
+	}
+
+	public void setEventName(String name) {
+		this.eventName = name;
+	}
+
+	public void setStartDate(int startYear, int startMonth, int startDay,
+			int startHour, int startMinute) {
+		startDate.set(startYear, startMonth - 1, startDay, startHour,
+				startMinute);
+	}
+
+	public void setStartDate(GregorianCalendar startDate) {
+		this.startDate = startDate;
+	}
+
+	public void setEndDate(int endYear, int endMonth, int endDay, int endHour,
+			int endMinute) {
+		endDate.set(endYear, endMonth - 1, endDay, endHour, endMinute);
+	}
+
+	public void setEndDate(GregorianCalendar endDate) {
+		this.endDate = endDate;
+	}
+
+	public void setArtist(Artist artist) {
+		this.artist.setName(artist.getName());
+		this.artist.setGenre(artist.getGenre());
+		this.artist.setImageIcon(artist.getImage());
+		this.artist.setDescription(artist.getDescription());
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public void setExpectedPopularity(int popularity) {
+		this.expectedPopularity = popularity;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
+	
+	public int getLength()
+	{
+		return getEndTime() - getStartTime();
+	}
+	
+	public int getStartTime()
+	{
+		DateFormat format = new SimpleDateFormat("kkmm");
+		format.setLenient(false);
+//		System.out.println(format.format(startDate.getTime()));
+		
+//		System.out.println(date.get(Calendar.HOUR_OF_DAY));
+		int time = Integer.valueOf(format.format(startDate.getTime()));
+		int hours = time/100;
+		int minutes = time%100;
+		int finaltime;
+		if(minutes != 0)
+		{
+			finaltime = hours*60 + minutes;
+		}
+		else
+		{
+			finaltime = hours*60;
+		}
+		return finaltime;
+	}
+	
+	public int getEndTime()
+	{
+		DateFormat format = new SimpleDateFormat("kkmm");
+		format.setLenient(false);
+//		System.out.println(format.format(endDate.getTime()));
+		int time = Integer.valueOf(format.format(endDate.getTime()));
+		int hours = time/100;
+		int minutes = time%100;
+		int finaltime;
+		if(minutes != 0)
+		{
+			finaltime = hours*60 + minutes;
+		}
+		else
+		{
+			finaltime = hours*60;
+		}
+		
+		return finaltime;
+	}
+	
+	public void setStartTime(int hours, int minutes)
+	{
+//		System.out.println("Start:" + hours + ":" + minutes);
+		startDate.set(Calendar.HOUR_OF_DAY, hours);
+		startDate.set(Calendar.MINUTE, minutes);
+//		System.out.println(startDate.getTime());
+	}
+	
+	public void setEndTime(int hours, int minutes)
+	{
+//		System.out.println("End:" + hours + ":" + minutes);
+		endDate.set(Calendar.HOUR_OF_DAY, hours);
+		endDate.set(Calendar.MINUTE, minutes);
+//		System.out.println(endDate.getTime());
+	}
+
+	public String toString() {
+		DateFormat format = new SimpleDateFormat("dd-MM-yyyy");
+		format.setLenient(false);
+
+		return artist.getName() + " plays from "
+				+ format.format(startDate.getTime()) + " to "
+				+ format.format(endDate.getTime()) + ".";
+	}
+}
diff --git a/Agenda/EventPanel.java b/Agenda/EventPanel.java
new file mode 100644
index 0000000..b8c8abb
--- /dev/null
+++ b/Agenda/EventPanel.java
@@ -0,0 +1,75 @@
+package Agenda;
+
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.SimpleDateFormat;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+
+public class EventPanel extends JPanel{
+
+	private static final long serialVersionUID = 504733981352439417L;
+
+	public EventPanel(Event event, Agenda a, TabbedPane tab)
+	{
+		super(new BorderLayout());
+		SimpleDateFormat dateformatter = new SimpleDateFormat("dd-MM-yyyy");
+		SimpleDateFormat timeformatter = new SimpleDateFormat("HH:mm");
+		JPanel box1 = new JPanel();
+		box1.setLayout(new BoxLayout(box1, BoxLayout.PAGE_AXIS));
+		JPanel box2 = new JPanel();
+		box2.setLayout(new BoxLayout(box2, BoxLayout.LINE_AXIS));
+		JPanel box3 = new JPanel();
+		box3.setLayout(new BoxLayout(box3, BoxLayout.PAGE_AXIS));
+		JPanel row = new JPanel();
+		row.setLayout(new BoxLayout(row, BoxLayout.LINE_AXIS));
+		JPanel panel = new JPanel();
+		JButton edit = new JButton("Edit Info");
+		edit.addActionListener(new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				EditEventPanel edit = new EditEventPanel(a, event, tab);
+			}
+		});
+		panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
+		JLabel title = new JLabel(event.getEventName());
+		JLabel date = new JLabel("<html>" + dateformatter.format(event.getEndDate().getTime()) + "</html>");
+		JLabel data = new JLabel("<html> " + event.getStage().getName() +  "<br> <br>" + event.getArtist().getName() + "<br> <br>" + event.getExpectedPopularity() + "<br> <br>" + timeformatter.format(event.getStartDate().getTime()) + " - " + timeformatter.format(event.getEndDate().getTime()) + "<br> <br> </html>");
+		JLabel text = new JLabel("<html> Podium: <br> <br> Artiest: <br> <br> Populariteit: <br> <br> Tijd: <br> <br> </html>");
+		box2.setAlignmentX(LEFT_ALIGNMENT);
+		date.setFont(new Font("Dialog", Font.BOLD, 15));
+		row.setAlignmentX(LEFT_ALIGNMENT);
+		date.setAlignmentX(RIGHT_ALIGNMENT);
+		title.setFont(new Font("Dialog", Font.BOLD, 20));
+		text.setFont(new Font("Dialog", Font.BOLD, 15));
+		data.setFont(new Font("Dialog", Font.PLAIN, 15));
+		JLabel description = new JLabel("<html> <b> Beschrijving </b> <br> <br>" + event.getDescription() + "</html>");
+		description.setFont(new Font("Dialog", Font.PLAIN, 12));
+		row.add(title);
+		row.add(Box.createRigidArea(new Dimension(10,0)));
+		row.add(edit);
+		row.add(Box.createRigidArea(new Dimension(30,0)));
+		row.add(date);
+		box1.add(row);
+		box1.add(new JSeparator(SwingConstants.HORIZONTAL));
+		box2.add(text);
+		box2.add(data);
+		box3.add(new JSeparator(SwingConstants.HORIZONTAL));
+		box3.add(description);
+		panel.add(box1);
+		panel.add(box2);
+		panel.add(box3);
+		add(panel, BorderLayout.CENTER);
+	}
+}
diff --git a/Agenda/MenuBar.java b/Agenda/MenuBar.java
new file mode 100644
index 0000000..6448933
--- /dev/null
+++ b/Agenda/MenuBar.java
@@ -0,0 +1,135 @@
+package Agenda;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+
+
+public class MenuBar extends JMenuBar {
+
+	private static final long serialVersionUID = -2095136277753179215L;
+
+	
+	public MenuBar(Window w)
+	{
+		super();
+		
+		/*
+		 * FILE
+		 */
+		JMenu file = new JMenu("File");
+		
+		JMenuItem newEvent = new JMenuItem("New Event");
+		newEvent.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK));
+		newEvent.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				new AddEventPanel(w.getAgenda());
+			}
+		});
+		
+		JMenuItem newArtist = new JMenuItem("New Artist");
+		newArtist.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				new AddArtistPanel(w.getAgenda());
+			}
+		});
+		
+		JMenuItem newStage = new JMenuItem("New Stage");
+		newStage.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				new AddStagePanel(w.getAgenda());
+			}
+		});
+		
+		JMenuItem newAgenda = new JMenuItem("New Agenda");
+		newAgenda.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to create a new agenda?", "New Agenda", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					Agenda ag = w.getAgenda();
+					ag.clearAgenda();
+					Window.updatePanel();
+				}
+			}
+		});
+		
+		JMenuItem open = new JMenuItem("Open");
+		open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
+		open.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				w.getAgenda().loadAgenda();
+				Window.updatePanel();
+			}
+		});
+		
+		JMenuItem save = new JMenuItem("Save");
+		save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK));
+		save.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				w.getAgenda().saveAgenda();
+				Window.updatePanel();
+			}
+		});
+		
+		JMenuItem exit = new JMenuItem("Exit"); 
+		exit.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to close this program?", "Close Agenda", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					System.exit(0);
+				}
+			}
+		});
+		
+		file.add(newEvent);
+		file.add(newArtist);
+		file.add(newStage);
+		file.addSeparator();
+		file.add(newAgenda);
+		file.addSeparator();
+		file.add(open);
+		file.add(save);
+		file.addSeparator();
+		file.add(exit);
+		add(file);
+		
+		
+		/*
+		 * VIEW
+		 */
+		
+		JMenu view = new JMenu("View");
+		
+		JMenuItem timeline = new JMenuItem("Timeline");
+		timeline.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				Window.changePanel("timeline");
+			}
+		});
+		
+		JMenuItem table = new JMenuItem("Table");
+		table.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				Window.changePanel("table");
+			}
+		});
+		
+		JMenuItem art_sta = new JMenuItem("Artists and Stages");
+		art_sta.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				Window.changePanel("art_sta");
+			}
+		});
+		
+		view.add(timeline);
+		view.add(table);
+		view.add(art_sta);
+		add(view);
+	}
+}
diff --git a/Agenda/Panel.java b/Agenda/Panel.java
new file mode 100644
index 0000000..96379c1
--- /dev/null
+++ b/Agenda/Panel.java
@@ -0,0 +1,6 @@
+package Agenda;
+import java.util.ArrayList;
+
+public interface Panel{
+	public void update(ArrayList<Event> event);
+}
diff --git a/Agenda/PanelArtSta.java b/Agenda/PanelArtSta.java
new file mode 100644
index 0000000..fa54cb1
--- /dev/null
+++ b/Agenda/PanelArtSta.java
@@ -0,0 +1,124 @@
+package Agenda;
+import java.awt.Dimension;
+import java.util.ArrayList;
+
+import javax.swing.AbstractListModel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+public class PanelArtSta extends JPanel implements Panel{
+
+	private Agenda a;
+	JList artists;
+	JList stages;
+	Object[] dataArtist;
+	Object[] dataStage;
+	Window w;
+	
+	public PanelArtSta(Window w)
+	{
+		super();
+		a = w.getAgenda();
+		this.w = w;
+		
+		artists = new JList();
+		artists.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+		artists.setLayoutOrientation(JList.VERTICAL_WRAP);
+		artists.setVisibleRowCount(-1);
+		artists.addListSelectionListener(new ListSelectionListener() {
+			@Override
+			public void valueChanged(ListSelectionEvent e) {
+				if (e.getValueIsAdjusting() == false) {
+
+			        if (artists.getSelectedIndex() == -1) {
+			        } else {
+			            new EditArtistPanel(w.getAgenda(), a.getArtists().get(artists.getSelectedIndex()), null);
+			            artists.clearSelection();
+			        }
+			    }
+			}
+		});
+		JScrollPane artistScroller = new JScrollPane(artists);
+		artistScroller.setPreferredSize(new Dimension(250, 80));
+		
+		stages = new JList();
+		stages.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+		stages.setLayoutOrientation(JList.VERTICAL_WRAP);
+		stages.setVisibleRowCount(-1);
+		stages.addListSelectionListener(new ListSelectionListener() {
+			@Override
+			public void valueChanged(ListSelectionEvent e) {
+				if (e.getValueIsAdjusting() == false) {
+
+			        if (stages.getSelectedIndex() == -1) {
+			        } else {
+			        	new EditStagePanel(w.getAgenda(), a.getStages().get(stages.getSelectedIndex()));
+			            stages.clearSelection();
+			        }
+			    }
+			}
+		});
+		JScrollPane stageScroller = new JScrollPane(stages);
+		stageScroller.setPreferredSize(new Dimension(250, 80));
+		
+		add(artistScroller);
+		add(stageScroller);
+	}
+	
+	
+	public void compileData()
+	{
+		int artistsList = a.getArtists().size();
+		int stagesList = a.getStages().size();
+		
+		if(artistsList > 0)
+		{
+			dataArtist = new Object[artistsList];
+			for(int i = 0; i < artistsList; i++)
+			{
+				dataArtist[i] = a.getArtists().get(i);
+			}
+			artists.setEnabled(true);
+		}
+		else
+		{
+			dataArtist = new Object[1];
+			dataArtist[0] = new Artist("Geen Artists", "Geen Artists", "null", "Geen Artists", "Geen Artists");
+			artists.setEnabled(false);
+		}
+		
+		if(stagesList > 0)
+		{
+			dataStage = new Object[stagesList];
+			
+			for(int i = 0; i < stagesList; i++)
+			{
+				dataStage[i] = a.getStages().get(i);
+			}
+			stages.setEnabled(true);
+		}
+		else
+		{
+			dataStage = new Object[1];
+			dataStage[0] = new Stage("Geen Stages", "Geen Stages");
+			stages.setEnabled(false);
+		}
+	}
+	
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void update(ArrayList<Event> event) {
+		a = w.getAgenda();
+		compileData();
+		AbstractListModel artistsList = new ContentList(dataArtist);
+		AbstractListModel stagesList = new ContentList(dataStage);
+		artists.setModel(artistsList);
+		stages.setModel(stagesList);
+	}
+
+}
diff --git a/Agenda/PanelTable.java b/Agenda/PanelTable.java
new file mode 100644
index 0000000..eb406aa
--- /dev/null
+++ b/Agenda/PanelTable.java
@@ -0,0 +1,225 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+
+/**
+ * Constructs a JTable in a ScrolPane.
+ * @author Wesley
+ * @version 1.3
+ */
+public class PanelTable extends JPanel implements Panel{
+
+	private static final long serialVersionUID = 1L;
+	private JScrollPane scrollPane;
+	private Object[][] data;
+	private String[] columnNames = {"Stage",
+            "Event",
+            "Artist",
+            "Begin Time",
+            "End Time"};
+	private ArrayList<Event> events;
+	private ArrayList<Event> fullEvents;
+	private JTable table;
+	private JTable selectedCell;
+	private Agenda a;
+	
+	/**
+	 * Constructor makes the table and adds it to a scrollPane.
+	 * @param events
+	 */
+	public PanelTable(Agenda a) {
+		super.setLayout(new BorderLayout());
+		this.a = a;
+		table= new JTable();
+		table.setAutoCreateRowSorter(true);
+		table.setAutoResizeMode(table.AUTO_RESIZE_ALL_COLUMNS);
+		table.getTableHeader().setReorderingAllowed(false);
+		table.addMouseListener(new MouseAdapter() {
+			public void mouseClicked(MouseEvent e) { if(e.getClickCount() > 1 ) cellClicked(e); else selectedCell = (JTable) e.getSource(); }
+		});
+		scrollPane = new JScrollPane(table,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);	
+		add(scrollPane,BorderLayout.SOUTH);	
+		JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		JButton button;
+		button = new JButton("Filter");
+		button.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) { filter(); }
+		});
+		buttonPanel.add(button);
+		button = new JButton(new ImageIcon("sprites/sprite0.png"));
+		button.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) { update(fullEvents, true); }
+		});
+		buttonPanel.add(button);
+		add(buttonPanel,BorderLayout.NORTH);
+	}
+	
+	/**
+	 * Sets the size of the scrollPane, in which the table is placed to fill out its container panel (not sure if this is needed?)
+	 */
+	public void paintComponent(Graphics g) {
+		scrollPane.setPreferredSize(new Dimension(getWidth(),getHeight()-35));
+	}
+	
+	/**
+	 * Gets the data from the events arrayList and makes a 2D-array of it.
+	 * @param columnes
+	 * @param rows
+	 */
+	public void compileData(int columnes, int rows) {
+		SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy HH:mm");
+		data = new Object[rows][columnes];	
+			for(int x = 0; x < rows; x++) {
+				Object[] tempData = new Object[columnes];
+				tempData[0] = events.get(x).getStage().getName();
+				tempData[1] = events.get(x).getEventName();
+				tempData[2] = events.get(x).getArtist().getName();
+				tempData[3] = formatter.format(events.get(x).getStartDate().getTime());
+				tempData[4] = formatter.format(events.get(x).getEndDate().getTime());
+				data[x] = tempData;
+			}		  
+	}
+	
+	/**
+	 * Refreshes the content on the table with a fresh ArrayList of events, useful when things are removed and added and should be called every time you update the list.
+	 * @param events
+	 */
+	public void update(ArrayList<Event> events)
+	{
+		update(events, true);
+	}
+	
+	public void update(ArrayList<Event> events, boolean newList) {
+		this.events = events;
+		if(newList)
+			this.fullEvents = events;
+		compileData(columnNames.length,events.size());
+		AbstractTableModel tableModel = new ContentTable(data,columnNames);
+		table.setModel(tableModel);
+	}
+	
+	/**
+	 * Method for the action listener when a cell is clicked, opens dialog of the clicked cell.
+	 * @param e
+	 */
+	private void cellClicked(MouseEvent e) {
+		JTable target = (JTable) e.getSource();
+		switch(target.getSelectedColumn()) {
+			case 0:
+				//A dialog for podia?
+				break;
+			case 1:
+				openEventDialog(target.getSelectedRow());
+				break;
+			case 2:
+				openArtistDialog(target.getSelectedRow());
+				break;
+		}
+	}
+
+	/**
+	 * Opens a dialog with information of the selected event. 
+	 * @param row
+	 */
+	private void openEventDialog(int row) {
+		Event event = events.get(row);
+		new TabbedPane(a, event, true);				
+	}
+	
+	/**
+	 * Opens a dialog with information of the selected artist
+	 * @param row
+	 */
+	private void openArtistDialog(int row) {
+		Event event = events.get(row);
+		new TabbedPane(a, event, false);				
+	}
+	
+	/**
+	 * Filter method which filters on the currently selected cell.
+	 * Needs to be under a button action, also a reset button is needed so list can be restored.
+	 */
+	public void filter() {
+		if(selectedCell != null) {
+			if(fullEvents.isEmpty()) {
+				fullEvents = events;
+			}
+			ArrayList<Event> filteredList = new ArrayList<>();
+			switch(selectedCell.getSelectedColumn()) {
+			case 0:
+				for(Event event : fullEvents) {
+					if(event.getStage().equals(events.get(selectedCell.getSelectedRow()).getStage())) {
+						filteredList.add(event);
+					}
+				}
+				break;
+			case 1: 
+				for(Event event : fullEvents) {
+					if(event.getEventName().equals(events.get(selectedCell.getSelectedRow()).getEventName())) {
+						filteredList.add(event);
+					}
+				}
+				break;
+			case 2: 
+				for(Event event : fullEvents) {
+					if(event.getArtist().equals(events.get(selectedCell.getSelectedRow()).getArtist())) {
+						filteredList.add(event);
+					}
+				}
+				break;
+			case 3:
+				int selectedCellStartTime = events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getHours()*100;
+				selectedCellStartTime += events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getMinutes();
+				int selectedCellEndTime = events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getHours()*100;
+				selectedCellEndTime += events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getMinutes();
+				for(Event event : fullEvents) {
+					int time = event.getStartDate().getTime().getHours()*100;
+					time += event.getStartDate().getTime().getMinutes();
+					if(time >= selectedCellStartTime && time <= selectedCellEndTime) {
+						filteredList.add(event);
+					}
+				}
+				break;
+			case 4:
+				selectedCellStartTime = events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getHours()*100;
+				selectedCellStartTime += events.get(selectedCell.getSelectedRow()).getStartDate().getTime().getMinutes();
+				selectedCellEndTime = events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getHours()*100;
+				selectedCellEndTime += events.get(selectedCell.getSelectedRow()).getEndDate().getTime().getMinutes();
+				for(Event event : fullEvents) {
+					int time = event.getEndDate().getTime().getHours()*100;
+					time += event.getEndDate().getTime().getMinutes();
+					if(time >= selectedCellStartTime && time <= selectedCellEndTime) {
+						filteredList.add(event);
+					}
+				}
+				break;
+			}
+			update(filteredList,false);	
+			selectedCell = null;
+		}
+		else {
+			JOptionPane.showMessageDialog(this, "Select a cell with the value u want to filter on","No cell selected",JOptionPane.WARNING_MESSAGE);
+		}
+	}
+
+}
diff --git a/Agenda/SaveLoad.java b/Agenda/SaveLoad.java
new file mode 100644
index 0000000..cdb8a2e
--- /dev/null
+++ b/Agenda/SaveLoad.java
@@ -0,0 +1,124 @@
+package Agenda;
+
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
+
+public class SaveLoad {
+	
+	public static void saveFile(Object obj)
+	{
+		JFileChooser fileChooser = new JFileChooser();
+		
+		fileChooser.setFileFilter(new FileFilter() {
+				@Override
+				public boolean accept(File pathname) {
+					if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+					{
+						return true;
+					}else if(pathname.isDirectory()){return true;}else{return false;}
+				}
+
+				@Override
+				public String getDescription() {
+					return "Agenda (.agn)";
+				}
+			
+		});
+		fileChooser.setDialogTitle("Choose save location");
+		int userSelection = fileChooser.showSaveDialog(null);
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
+		{
+			File file = fileChooser.getSelectedFile();
+			if(!file.getName().endsWith(".agn"))
+			{
+				file = new File(file.getAbsolutePath() + ".agn");
+			}
+			
+			if(file.exists())
+			{
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					save(obj, file);
+				}
+			}
+			else
+			{
+				save(obj, file);
+			}
+		}
+	}
+	
+	public static Object loadFile()
+	{
+		JFileChooser fileChooser = new JFileChooser();
+		fileChooser.setFileFilter(new FileFilter() {
+			@Override
+			public boolean accept(File pathname) {
+				if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+				{
+					return true;
+				}else if(pathname.isDirectory()){return true;}else{return false;}
+			}
+
+			@Override
+			public String getDescription() {
+				return "Agenda (.agn)";
+			}
+		
+		});
+		
+		fileChooser.setDialogTitle("Choose file");
+		int userSelection = fileChooser.showOpenDialog(null);
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
+		{
+			File file = fileChooser.getSelectedFile();
+			if(!file.exists())
+			{
+				JOptionPane.showMessageDialog(null, "This file does not exist: " + file.getName());
+			}
+			else
+			{
+				return load(file);
+			}
+		}
+		
+		return null;
+		}
+		
+		private static void save(Object obj, File file)
+		{
+			ObjectOutputStream oostr = null;
+			try {
+				oostr = new ObjectOutputStream(new FileOutputStream(file));
+				oostr.writeObject(obj);
+				oostr.flush();
+				oostr.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		private static Object load(File file)
+		{
+			ObjectInputStream oistr = null;
+			try {
+				oistr = new ObjectInputStream(new FileInputStream(file));
+				Object obj = oistr.readObject();
+				oistr.close();
+				return obj;
+			} catch (IOException | ClassNotFoundException e) {
+				return null;
+			}
+		}
+}
diff --git a/Agenda/Stage.java b/Agenda/Stage.java
new file mode 100644
index 0000000..301a11b
--- /dev/null
+++ b/Agenda/Stage.java
@@ -0,0 +1,41 @@
+package Agenda;
+import java.io.Serializable;
+
+public class Stage implements Serializable {
+
+	private static final long serialVersionUID = 1;
+	
+	private String name;
+	private String description;
+	
+	public Stage(String name, String description)
+	{
+		this.name = name;
+		this.description = description;
+	}
+	
+	public String getName()
+	{
+		return this.name;
+	}
+		
+	public String getDescription()
+	{
+		return this.description;
+	}
+	
+	public void setDescription(String description)
+	{
+		this.description = description;
+	}
+	
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+	
+	public String toString()
+	{
+		return name;
+	}
+}
diff --git a/Agenda/StagePanel.java b/Agenda/StagePanel.java
new file mode 100644
index 0000000..470c98d
--- /dev/null
+++ b/Agenda/StagePanel.java
@@ -0,0 +1,96 @@
+package Agenda;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
+import java.awt.image.BufferedImage;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+
+public class StagePanel extends JPanel 
+{
+	private BufferedImage image;
+	private int width, height, posX;
+	private double widthD, posXD;
+	private Event event;
+	public StagePanel(int width, int height, int posX, Event event, double widthD, double posXD) 
+	{
+		this.width = width;
+		this.height = height;
+		this.posX = posX;
+		this.event = event;
+		this.widthD = widthD;
+		this.posXD = posXD;
+		image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_ARGB);
+		Graphics2D g2 = image.createGraphics();
+		g2.setColor(Color.blue);
+		g2.fillRect(0, 0, image.getWidth(), image.getHeight());
+	}
+	
+	public void paint(Graphics g)
+	{
+		super.paint(g);
+		((Graphics2D)g).drawImage(image, this.posX, 0, this);
+	}
+
+	public StagePanel(LayoutManager arg0) 
+	{
+		super(arg0);
+
+	}
+
+	public StagePanel(boolean arg0) 
+	{
+		super(arg0);
+
+	}
+	
+	public void update(int posx, double posXD)
+	{
+		this.posX = posx;
+		this.posXD = posXD;
+		repaint();
+	}
+	
+
+	public StagePanel(LayoutManager arg0, boolean arg1) 
+	{
+		super(arg0, arg1);
+
+	}
+	
+	public double getPosX()
+	{
+		return this.posXD;
+	}
+	
+	public void setLength(int length, double widthD)
+	{
+		this.width = length;
+		this.widthD = widthD;
+	}
+	
+	public void setStageStartTime(int hours, int minutes)
+	{
+		event.setStartTime(hours, minutes);
+	}
+	
+	public void setStageEndTime(int hours, int minutes)
+	{
+		event.setEndTime(hours, minutes);
+	}
+	
+	public int getStageStartTime()
+	{
+		return event.getStartTime();
+	}
+	
+	public double getImageWidth()
+	{
+		return this.widthD;
+	}
+
+}
diff --git a/Agenda/TabbedPane.java b/Agenda/TabbedPane.java
new file mode 100644
index 0000000..5405acf
--- /dev/null
+++ b/Agenda/TabbedPane.java
@@ -0,0 +1,28 @@
+package Agenda;
+
+//een jframe met info, heeft alleen een agenda object, event object (het desbetreffende event) en een boolean met daarin true of false (slaande op je wel of niet met het event wilt starten) nodig.
+//Voorderest heeft dit niks nodig en is het een apart openend JFrame wat gewoon weer afgesloten kan worden.
+import javax.swing.JFrame;
+import javax.swing.JTabbedPane;
+
+public class TabbedPane extends JFrame{
+
+	public TabbedPane(Agenda a, Event event, boolean eventSelected)
+	{
+		super("info GUI");
+		JTabbedPane tab = new JTabbedPane();
+		tab.add("Event", new EventPanel(event, a, this));
+		tab.add("Artist", new ArtistPanel(event, a, this));
+		if(eventSelected)
+		{
+			tab.setSelectedIndex(0);
+		}
+		else
+		{
+			tab.setSelectedIndex(1);
+		}
+		setContentPane(tab);
+		setSize(480, 410);
+		setVisible(true);
+	}
+}
\ No newline at end of file
diff --git a/Agenda/Timeline.java b/Agenda/Timeline.java
new file mode 100644
index 0000000..e1b388f
--- /dev/null
+++ b/Agenda/Timeline.java
@@ -0,0 +1,456 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+
+@SuppressWarnings({ "serial" })
+public class Timeline extends JPanel
+{
+	private ArrayList<Event> events = new ArrayList<Event>();
+	private JPanel frame;
+
+//	Geef dit object je JFrame mee, en zet in je JFrame de volgende code:
+//	this.setContentPane(timeline.getTimeline());
+//	this.getRootPane().addComponentListener(new ComponentAdapter() 
+//	{
+//		public void componentResized(ComponentEvent e) {
+//            timeline.refresh();
+//        }
+//	});
+	
+	
+	public Timeline(JPanel frame) 
+	{
+		super();
+		this.frame = frame;
+
+		genStages();
+		this.setSize(frame.getWidth(), frame.getHeight());
+//		refresh();
+		
+	}
+	
+	public void setEvents(ArrayList<Event> events)
+	{
+		this.events = events;
+	}
+
+	public void refresh()
+	{
+		this.removeAll();	
+		createMainPanel();
+		this.revalidate();
+	}
+	
+	public JPanel createMainPanel()
+	{
+//		this.setSize(frame.getWidth(), frame.getHeight());
+		JPanel mainPanel = new JPanel();
+		mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+		Container topContainer = createTopPanel();
+		Dimension dim = new Dimension(this.getWidth(), 60);
+		topContainer.setMaximumSize(dim);
+		mainPanel.add(topContainer);
+		
+		Dimension centerDim = new Dimension(this.getWidth(), this.getHeight());
+		
+//		Container centerContainer = createCenterPanel();
+		JPanel centerContainer = createCenterPanel();
+		centerContainer.setPreferredSize(centerDim);
+
+		centerContainer.setMaximumSize(centerDim);
+//		System.out.println(centerDim);
+		mainPanel.add(centerContainer);
+		this.add(mainPanel, BorderLayout.CENTER);
+		return mainPanel;
+	}
+
+	private JPanel createCenterPanel()
+	{
+
+		JPanel centerPanel = new JPanel();
+		centerPanel.setBackground(Color.lightGray);
+		centerPanel.setLayout(new BoxLayout(centerPanel, BoxLayout.Y_AXIS));
+		centerPanel.add(Box.createRigidArea(new Dimension(0, 30)));
+
+		for(Event event : events)
+		{
+			StagePanel stagepanel = new StagePanel((int)calcLengthOfStage(event.getLength()), 30, (int)calcPositionOfStage(event.getStartTime()), event,calcLengthOfStage(event.getLength()),calcPositionOfStage(event.getStartTime()));
+			Container content = stagepanel;
+			content.setMaximumSize(new Dimension(this.getWidth(),30));
+			content.addMouseListener(new MouseListener() {
+				
+				@Override
+				public void mouseReleased(MouseEvent e) {
+					resizeTimeline(stagepanel);
+				}
+				
+				@Override
+				public void mousePressed(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseExited(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseEntered(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					
+				}
+			});
+			content.addMouseMotionListener(new MouseMotionListener() {
+
+				@Override
+				public void mouseMoved(MouseEvent e) {
+
+				}
+
+				@Override
+				public void mouseDragged(MouseEvent e) {
+					int value = (int)(e.getX() - stagepanel.getImageWidth() / 2);
+					double value2 = (e.getX() - stagepanel.getImageWidth() / 2);
+//					System.out.println("Value1: " + value);
+//					System.out.println("Value2: " + value2);
+					stagepanel.update(value, value2);
+				}
+			});
+			centerPanel.add(content);
+			centerPanel.add(Box.createRigidArea(new Dimension(0,15)));
+		}
+
+//		this.add(centerPanel, BorderLayout.CENTER);
+		return centerPanel;
+	}
+
+	public void resizeTimeline(StagePanel stagepanel)
+	{
+//		System.out.println(stagepanel.getStageStartTime());
+//		System.out.println(calcStartTimeOfStagePanel(stagepanel.getPosX()));
+		stagepanel.setStageStartTime(calcStartTimeOfStagePanelHours(stagepanel.getPosX()),calcStartTimeOfStagePanelMinutes(stagepanel.getPosX()));
+		stagepanel.setStageEndTime(calcEndTimeOfStagePanelHours(stagepanel.getPosX(), stagepanel.getImageWidth()),calcEndTimeOfStagePanelMinutes(stagepanel.getPosX(), stagepanel.getImageWidth()));
+//		stagepanel.setLength(calcLengthOfStagePanel(stagepanel.getImageWidth()));
+//		System.out.println("HOURS: " + calcEndTimeOfStagePanelHours(stagepanel.getPosX(), stagepanel.getImageWidth()));
+//		System.out.println("MINUTES: " + calcEndTimeOfStagePanelMinutes(stagepanel.getPosX(), stagepanel.getImageWidth()) );
+//		TimelinePanel tempPanel = (TimelinePanel) frame;
+//		tempPanel.refresh();
+		refresh();
+//		System.out.println(stagepanel.getPosX());
+	}
+	
+	public double calcLengthOfStage(double length)
+	{
+		double lengthOfStage = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		
+		double frameWidth = this.getWidth();
+		double minmax = max-min;
+		double pixelsPerLength = frameWidth / minmax;
+		lengthOfStage =  pixelsPerLength * (double)length;
+//		System.out.println("LengthOfStage: " + lengthOfStage);
+//	
+//		System.out.println("MAX: " + max);
+//		System.out.println("MIN: " + min);
+//		System.out.println("LENGTH: " + length);
+//		System.out.println("FRAME: " + frameWidth);
+//		System.out.println("PixelsPerLEngth: " + pixelsPerLength);
+		
+		return lengthOfStage;
+	}
+	
+	public double calcLengthOfStagePanel(double length)
+	{
+		double lengthOfStagePanel = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		System.out.println(length);
+		double frameWidth = this.getWidth();
+		double minmax = max-min;
+		double pixelsPerLength = frameWidth / minmax;
+//		System.out.println(pixelsPerLength);
+		lengthOfStagePanel =  (double)length / pixelsPerLength;
+//		System.out.println(lengthOfStagePanel);
+		
+
+//		System.out.println("LengthOfStagePane: " + (int)lengthOfStagePanel);
+		
+		return lengthOfStagePanel;
+	}
+	
+	public double calcPositionOfStage(int startTime)
+	{
+		double posx;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		double minmax = max-min;
+		posx = startTime - min;
+		posx = posx * this.getWidth() / minmax;
+//		System.out.println("Frame: " + this.getWidth());
+//		System.out.println("startTime: " + startTime);
+//		System.out.println("Max: " + max + " min: " + min);
+//		System.out.println("Posx: " + posx);
+		return posx;
+	}
+	
+	public int calcStartTimeOfStagePanelHours(double posx)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		System.out.println("MIN: " + min);
+//		System.out.println("max: " + max);
+//		double startTime = (posx / (this.getWidth() / (max - min )) ) + min;
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double startTime = all + min;
+//		System.out.println("STPH: " + this.getWidth());
+		
+		
+
+		
+		return ((int)startTime / 60);
+	}
+	
+	public int calcStartTimeOfStagePanelMinutes(double posx)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		double startTime = (posx / (this.getWidth() / (max - min )) ) + min;
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double startTime = all + min;
+//		System.out.println("STPM: " + this.getWidth());
+		
+		return ((int)startTime % 60);
+	}
+
+	public int calcEndTimeOfStagePanelHours(double posx, double imageWidth)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double endTime = all + min + calcLengthOfStagePanel(imageWidth);
+//		System.out.println("ETPH: " + this.getWidth());
+		return (int)endTime / 60;
+	}
+	
+	public int calcEndTimeOfStagePanelMinutes(double posx, double imageWidth)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double endTime = all + min + calcLengthOfStagePanel(imageWidth);
+//		System.out.println("ETPM: " + this.getWidth());
+		return (int)endTime % 60;
+	}
+	
+	public int minutesToHours(int minutes)
+	{
+		return 10;
+	}
+	
+	public int intToTime(int time, String option)
+	{
+		if(option == "hours")
+		{
+			time = time % 24;
+		}
+		else if(option == "minutes")
+		{
+			time = time % 60;
+		}
+//		System.out.println(time);
+		return time;
+	}
+	
+	public int toHours(int minutesTot)
+	{
+		int hours = minutesTot / 60;
+		int minutes = minutesTot % 60;
+		int finaltime;
+		
+		finaltime = hours * 100 + minutes;
+		
+		return finaltime;
+	}
+	
+	public int findMinMax(int i)
+	{
+		//		Event oldevent = new Event(0, 0, null, "Base", 0);
+		//		ArrayList<Event> oldevents = new ArrayList<Event>();
+		//		oldevents.add(oldevent);
+		//		Steage oldstage = new Stage(oldevents,0,null, 0, 0);
+		ArrayList<Event> eventscopy = (ArrayList<Event>) events.clone();
+
+		Integer earliestStartTime = null;
+		Integer lastEndTime = null;
+
+		for(Event event : eventscopy)
+		{
+			if(i == 1)
+			{
+				if(earliestStartTime == null)
+				{
+
+					earliestStartTime = event.getStartTime();
+				}
+
+				else
+				{
+					if(event.getStartTime() < earliestStartTime)
+					{
+						earliestStartTime = event.getStartTime();
+					}
+				}
+			}
+			else if( i == 2)
+			{
+				if(lastEndTime == null)
+				{
+					lastEndTime = event.getEndTime();
+				}
+				else
+				{
+					if(event.getEndTime() > lastEndTime)
+					{
+						lastEndTime = event.getEndTime();
+					}
+				}
+			}
+		}
+		if(i == 1)
+		{
+			return earliestStartTime;
+		}
+		else if(i == 2)
+		{
+			return lastEndTime;
+		}
+		else
+		{
+			System.out.println("Return -1");
+			return -1;
+		}
+	}
+
+	private JPanel createTopPanel()
+	{
+		JPanel topPane = new JPanel();
+		topPane.setLayout(new BoxLayout(topPane, BoxLayout.Y_AXIS));
+		JPanel topPanel = new JPanel(new FlowLayout());
+		for(int i = 0; i <= this.getWidth() / 10; i++)
+		{
+			ImageIcon topImageIcon = new ImageIcon("src/sprites/block.png");
+			JLabel topImage = new JLabel(topImageIcon);
+			topPanel.add(topImage);
+		}
+		topPane.add(Box.createRigidArea(new Dimension(0,20)));
+		JPanel panel = new JPanel();
+		panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+		panel.add(Box.createRigidArea(new Dimension(50, 10)));
+		panel.add(new JLabel(Integer.toString(toHours(findMinMax(1)))));
+		panel.add(Box.createHorizontalGlue());
+		panel.add(new JLabel(Integer.toString(toHours(findMinMax(2)))));
+		panel.add(Box.createRigidArea(new Dimension(50, 10)));
+		topPane.add(panel);
+		topPane.add(topPanel);
+//		this.add(topPane, BorderLayout.NORTH);
+		return topPane;
+	}
+
+	public JPanel createWestPanel()
+	{
+		this.setSize(frame.getWidth(), frame.getHeight());
+		JPanel westPanel = new JPanel();
+		westPanel.setLayout(new BoxLayout(westPanel, BoxLayout.Y_AXIS));
+		westPanel.add(Box.createRigidArea(new Dimension(0, 100)));
+//		for(int i = 0; i < events.size(); i++)
+//		{
+//			JLabel stageText = new JLabel("Stage: " + (i+1) + "    ");
+//			westPanel.add(stageText);
+//			westPanel.add(Box.createRigidArea(new Dimension(0, 30 )));
+//		}
+		for(Event event : events)
+		{
+			JLabel stageText = new JLabel(event.getStage().getName() + ": " + "    ");
+			
+			westPanel.add(stageText);
+			westPanel.add(Box.createRigidArea(new Dimension(0, 30 )));
+		}
+//		this.add(westPanel, BorderLayout.WEST);
+		return westPanel;
+	}
+
+	private void genStages()
+	{
+//		ImageIcon image = new ImageIcon();
+//		Artist artist2 = new Artist("Henk", "paul2", "kaas", image, 2);
+//		Artist artist1 = new Artist("Kaas", "Paul", "Lala", image, 1);
+//		Event event2 = new Event(1900, 2000, artist2, "hi2", 2);
+//		Event event1 = new Event(600, 1800, artist1, "hi", 1);
+//		ArrayList<Event> performances = new ArrayList<Event>();
+//		performances.add(event1);
+//		performances.add(event2);
+//		Stage stage1 = new Stage(performances, 100, null, 1800, 2100);
+//		events.add(stage1);
+//		Stage stage2 = new Stage(performances, 100, null, 1700, 1900);
+//		Stage stage3 = new Stage(performances, 100, null, 1600, 1800);
+//		Stage stage4 = new Stage(performances, 100, null, 1600, 2100);
+//		events.add(stage3);
+//		events.add(stage2);
+////		stages.add(stage4);
+
+	}
+
+	public void createNull()
+	{
+		this.removeAll();
+		this.add(new JLabel("No events for this day"));
+		this.revalidate();
+	}
+	
+	public JPanel getTimeline()
+	{
+		return this;
+	}
+
+	
+}
diff --git a/Agenda/TimelinePanel.java b/Agenda/TimelinePanel.java
new file mode 100644
index 0000000..0e15d08
--- /dev/null
+++ b/Agenda/TimelinePanel.java
@@ -0,0 +1,74 @@
+package Agenda;
+import java.awt.BorderLayout;
+import java.util.ArrayList;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+
+public class TimelinePanel extends JPanel implements Panel {
+
+	private Timeline timeline;
+//	private WestPanel westPanel;
+	
+	public TimelinePanel() 
+	{
+		super(new BorderLayout());
+		
+		this.setSize(600, 600);
+		this.setVisible(true);
+		timeline = new Timeline(this);
+//		westPanel = new WestPanel();
+//		this.add(timeline.createMainPanel(),BorderLayout.CENTER);
+//		this.add(new JButton());
+//		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+	}
+	
+	public void refresh()
+	{
+		this.removeAll();	
+		timeline.refresh();
+//		westPanel.refresh();
+		this.add(timeline,BorderLayout.CENTER);
+		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+		this.revalidate();
+//		timeline.refresh();
+	}
+
+	@Override
+	public void update(ArrayList<Event> events) 
+	{
+		timeline.setEvents(events);
+//		System.out.println(events.size());
+//		westPanel.setEvents(events);
+//		refresh();
+//		this.add(timeline.createMainPanel(),BorderLayout.CENTER);
+//		this.add(new JButton());
+//		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+		
+		//dit fixt het half
+		if(events.size() != 0)
+		{
+			this.removeAll();
+			timeline.refresh();
+			this.add(timeline.createWestPanel(),BorderLayout.WEST);
+			this.add(timeline, BorderLayout.CENTER);
+			this.revalidate();
+		}
+		else
+		{
+			this.removeAll();
+			timeline.createNull();
+			this.add(timeline);
+			this.revalidate();
+		}
+		
+	}
+	
+	
+	public TimelinePanel getTimelinePanel()
+	{
+		return this;
+	}
+
+}
diff --git a/Agenda/Window.java b/Agenda/Window.java
new file mode 100644
index 0000000..fef9a21
--- /dev/null
+++ b/Agenda/Window.java
@@ -0,0 +1,237 @@
+package Agenda;
+
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import org.apache.commons.lang3.time.DateUtils;
+
+public class Window extends JFrame {
+	
+	private static final long serialVersionUID = 9023061329829975662L;
+	private static HashMap<String, Panel> panels = new HashMap<String, Panel>();
+	private static JPanel centerPanel;
+	private static GregorianCalendar date;
+	private static Agenda agenda;
+	private static String currentPanel = "table";
+	
+	public Window()
+	{
+		/*
+		 * Initialize window
+		 */
+		super("Agenda");
+		agenda = new Agenda();
+		
+		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+		addWindowListener(new WindowAdapter() {
+			 public void windowClosing(WindowEvent evt) {
+			     onExit();
+			 }
+		});
+		setSize(1200, 800);
+		
+		Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
+		setLocation(dim.width/2-this.getSize().width/2, dim.height/2-this.getSize().height/2);
+		
+        try {
+			UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			e.printStackTrace();
+		}
+
+		setJMenuBar(new MenuBar(this));
+		
+		
+		/*
+		 * Create Panels
+		 */
+		
+		//Agenda Panels
+		Panel tablePanel = new PanelTable(agenda);
+		panels.put("table", tablePanel);
+		
+		Panel art_staPanel = new PanelArtSta(this);
+		panels.put("art_sta", art_staPanel);
+		
+		Panel timeline = new TimelinePanel();
+		panels.put("timeline", timeline);
+		
+		//Main Panels
+		JPanel mainPanel = new JPanel(new BorderLayout());
+		centerPanel = new JPanel(new BorderLayout());
+		centerPanel.setBackground(Color.WHITE);
+		JPanel bottomPanel = new JPanel();
+		bottomPanel.setBackground(Color.DARK_GRAY);
+		
+		date = new GregorianCalendar();
+		SimpleDateFormat formatter=new SimpleDateFormat("dd-MM-yyyy");
+		JLabel dateLabel = new JLabel(formatter.format(date.getTime()));
+		dateLabel.setForeground(Color.WHITE);
+		bottomPanel.add(dateLabel);
+		
+		JButton backWeekButton = new JButton("<<");
+		backWeekButton.setToolTipText("Go one week back");
+		backWeekButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {	
+				date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) - 7);
+				dateLabel.setText(formatter.format(date.getTime()));
+				updatePanel();
+			}
+		});
+		bottomPanel.add(new JSeparator(SwingConstants.VERTICAL));
+		bottomPanel.add(backWeekButton);
+		
+		JButton backDayButton = new JButton("<");
+		backDayButton.setToolTipText("Go one day back");
+		backDayButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {	
+				date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) - 1);
+				dateLabel.setText(formatter.format(date.getTime()));
+				updatePanel();
+			}
+		});
+		bottomPanel.add(new JSeparator(SwingConstants.VERTICAL));
+		bottomPanel.add(backDayButton);
+		
+		JButton todayButton = new JButton("||");
+		todayButton.setToolTipText("Go to today");
+		todayButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {	
+				date = new GregorianCalendar();
+				dateLabel.setText(formatter.format(date.getTime()));
+				updatePanel();
+			}
+		});
+		bottomPanel.add(new JSeparator(SwingConstants.VERTICAL));
+		bottomPanel.add(todayButton);
+		
+		JButton forwardDayButton = new JButton(">");
+		forwardDayButton.setToolTipText("Go one day forward");
+		forwardDayButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {	
+				date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) + 1);
+				dateLabel.setText(formatter.format(date.getTime()));
+				updatePanel();
+			}
+		});
+		bottomPanel.add(new JSeparator(SwingConstants.VERTICAL));
+		bottomPanel.add(forwardDayButton);
+		
+		JButton forwardWeekButton = new JButton(">>");
+		forwardWeekButton.setToolTipText("Go one week forward");
+		forwardWeekButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {	
+				date.set(GregorianCalendar.DAY_OF_MONTH, date.get(GregorianCalendar.DAY_OF_MONTH) + 7);
+				dateLabel.setText(formatter.format(date.getTime()));
+				updatePanel();
+			}
+		});
+		bottomPanel.add(new JSeparator(SwingConstants.VERTICAL));
+		bottomPanel.add(forwardWeekButton);
+		
+		//Add panels
+		mainPanel.add(centerPanel, BorderLayout.CENTER);
+		mainPanel.add(bottomPanel, BorderLayout.SOUTH);
+		
+		setContentPane(mainPanel);
+		
+		updatePanel();
+		
+		//Show window
+		setVisible(true);
+		this.getRootPane().addComponentListener(new ComponentAdapter() 
+		{
+			public void componentResized(ComponentEvent e) {
+                if(currentPanel == "timeline")
+                {
+                	TimelinePanel tempTimeLine = (TimelinePanel) timeline;
+                    tempTimeLine.refresh();
+                }
+				
+
+            }
+		});
+	}
+	
+	public static void changePanel(String panel)
+	{
+		currentPanel = panel;
+		updatePanel();
+	}
+	
+	public static void updatePanel()
+	{
+		centerPanel.removeAll();
+		Panel p = panels.get(currentPanel);
+		p.update(getEvents());
+		JPanel p1 = (JPanel) p;
+		p1.setPreferredSize(centerPanel.getSize());
+		centerPanel.add(p1, BorderLayout.CENTER);
+		centerPanel.revalidate();
+		centerPanel.repaint();
+		p1.repaint();
+	}
+	
+	public void onExit() {
+		if(JOptionPane.showConfirmDialog(null, "Are you sure you want to close this program?", "Close Agenda", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+		{
+			setVisible(false);
+			dispose();
+		}
+	}
+	
+	public static ArrayList<Event> getEvents()
+	{
+		ArrayList<Event> events = new ArrayList<Event>();
+		for(Event e : agenda.getEvents())
+		{
+			if(DateUtils.isSameDay(e.getStartDate(), date) || DateUtils.isSameDay(e.getEndDate(), date))
+			{
+				events.add(e);
+			}
+		}
+		
+		return events;
+	}
+	
+	public Agenda getAgenda()
+	{
+		return agenda;
+	}
+	
+	public void setAgenda(Agenda a)
+	{
+		agenda = a; 
+	}
+	
+	
+}
diff --git a/Applicatie/Action.java b/Applicatie/Action.java
new file mode 100644
index 0000000..089755a
--- /dev/null
+++ b/Applicatie/Action.java
@@ -0,0 +1,38 @@
+package Applicatie;
+
+import java.awt.geom.Point2D;
+
+public class Action
+{
+
+	private Point2D position;
+	private int starttime;
+	private int duration;
+
+	public Action(Point2D position, int starttime, int duration)
+	{
+		this.position = position;
+		this.starttime = starttime;
+		this.duration = duration;
+	}
+
+	public Point2D getPosition()
+	{
+		return position;
+	}
+
+	public int getStartTime()
+	{
+		return starttime;
+	}
+
+	public int getStoptime()
+	{
+		return (starttime + duration);
+	}
+
+	public int getDuration()
+	{
+		return duration;
+	}
+}
\ No newline at end of file
diff --git a/Applicatie/ControlPanel.java b/Applicatie/ControlPanel.java
new file mode 100644
index 0000000..aa03eee
--- /dev/null
+++ b/Applicatie/ControlPanel.java
@@ -0,0 +1,131 @@
+package Applicatie;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+public class ControlPanel extends JPanel
+{
+	private static final long serialVersionUID = 6805244250902524351L;
+
+	private Panel p;
+	
+	public ControlPanel(Panel p)
+	{
+		super();
+		BoxLayout box = new BoxLayout(this, BoxLayout.X_AXIS);
+		setLayout(box);
+		this.p = p;
+		setPreferredSize(new Dimension(0,50));
+		setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
+		setBackground(new Color(220, 220, 220));
+		
+		
+		JPanel simulatorPanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		simulatorPanel.setPreferredSize(new Dimension(350,50));
+		simulatorPanel.setMaximumSize(new Dimension(350,50));
+		add(simulatorPanel);
+		{
+			JLabel simulatorLabel = new JLabel("Simulator: ");
+			simulatorLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
+			simulatorPanel.add(simulatorLabel);
+			
+			JButton playButton = new JButton("Play");
+			playButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			playButton.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e)
+				{
+					p.getT().start();
+				}
+			});
+			simulatorPanel.add(playButton);
+			
+			JButton pauseButton = new JButton("Pause");
+			pauseButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			pauseButton.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e)
+				{
+					p.getT().stop();
+				}
+			});
+			simulatorPanel.add(pauseButton);
+			
+			JButton stopButton = new JButton("Stop");
+			stopButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			stopButton.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e)
+				{
+					p.getT().stop();
+				}
+			});
+			simulatorPanel.add(stopButton);
+		}
+		
+		add(Box.createRigidArea(new Dimension(10,50)));
+		
+		JPanel timePanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		timePanel.setPreferredSize(new Dimension(280,50));
+		timePanel.setMaximumSize(new Dimension(280,50));
+		add(timePanel);
+		{
+			JLabel timeLabel = new JLabel("00:00 00-00-000");
+			timeLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			timePanel.add(timeLabel);
+			
+			JButton dateButton = new JButton("Pick Date");
+			dateButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			dateButton.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e)
+				{
+					///TODO implement
+				}
+			});
+			timePanel.add(dateButton);
+		}
+		
+		add(Box.createRigidArea(new Dimension(10,50)));
+		
+		JPanel peoplePanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		peoplePanel.setPreferredSize(new Dimension(285,50));
+		peoplePanel.setMaximumSize(new Dimension(285,50));
+		add(peoplePanel);
+		{
+			JLabel peopleLabel = new JLabel("0/0 People");
+			peopleLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			peoplePanel.add(peopleLabel);
+			
+			JButton peopleButton = new JButton("Set People");
+			peopleButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			peopleButton.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e)
+				{
+					p.addVisitors(1);
+				}
+			});
+			peoplePanel.add(peopleButton);
+		}
+		
+		add(Box.createHorizontalGlue());
+		
+		JPanel runningPanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		runningPanel.setPreferredSize(new Dimension(195,50));
+		runningPanel.setMaximumSize(new Dimension(195,50));
+		add(runningPanel);
+		{
+			JLabel runningLabel = new JLabel("Simulation stopped");
+			runningLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			runningPanel.add(runningLabel);
+		}
+		
+	}
+}
diff --git a/Applicatie/Images.java b/Applicatie/Images.java
new file mode 100644
index 0000000..4bb45ff
--- /dev/null
+++ b/Applicatie/Images.java
@@ -0,0 +1,37 @@
+package Applicatie;
+
+import java.awt.Image;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.ImageIcon;
+
+public class Images
+{
+
+	private static Map<String, Image> images;
+
+	public Images()
+	{
+		images = new HashMap<String, Image>();
+
+		images.put("entrance", loadImage("images/entrance.png"));
+		images.put("wc", loadImage("images/wc.png"));
+		images.put("path", loadImage("images/path.jpg"));
+		images.put("stage", loadImage("images/stage4.png"));
+		images.put("wall", loadImage("images/wall.png"));
+		images.put("stage1", loadImage("images/stage3.png"));
+		images.put("visitor", loadImage("images/visitor.png"));
+		images.put("food", loadImage("images/food.png"));
+	}
+
+	public static Image loadImage(String path)
+	{
+		return new ImageIcon(path).getImage();
+	}
+
+	public static Image getImage(String getter)
+	{
+		return images.get(getter);
+	}
+}
\ No newline at end of file
diff --git a/Applicatie/MenuBar.java b/Applicatie/MenuBar.java
index 486580f..6bcb68b 100644
--- a/Applicatie/MenuBar.java
+++ b/Applicatie/MenuBar.java
@@ -10,6 +10,7 @@ import javax.swing.JOptionPane;
 
 public class MenuBar extends JMenuBar
 {
+	private static final long serialVersionUID = 1L;
 
 	public MenuBar(Window w)
 	{
@@ -32,7 +33,7 @@ public class MenuBar extends JMenuBar
 			
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				
+				SaveLoad.load(w.getPanel());
 			}
 		});
 		file.add(item);
@@ -42,7 +43,19 @@ public class MenuBar extends JMenuBar
 			
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				
+				SaveLoad.save(w.getPanel());
+			}
+		});
+		file.add(item);
+		
+		file.addSeparator();
+		
+		item = new JMenuItem("Agenda");
+		item.addActionListener(new ActionListener()
+		{
+			public void actionPerformed(ActionEvent e)
+			{
+				new Agenda.Window();
 			}
 		});
 		file.add(item);
@@ -54,7 +67,8 @@ public class MenuBar extends JMenuBar
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				System.exit(0);
+				w.setVisible(false);
+				w.dispose();
 			}
 		});
 
@@ -89,4 +103,4 @@ public class MenuBar extends JMenuBar
 		add(file);
 		
 	}
-}
+}
\ No newline at end of file
diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java
index ed1894d..255b77f 100644
--- a/Applicatie/Panel.java
+++ b/Applicatie/Panel.java
@@ -8,6 +8,8 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Stroke;
 import java.awt.TexturePaint;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
@@ -20,7 +22,9 @@ import java.util.Iterator;
 
 import javax.imageio.ImageIO;
 import javax.swing.JPanel;
+import javax.swing.Timer;
 
+import Agenda.Agenda;
 import Listeners.Mouse;
 import Listeners.MouseMotion;
 import Listeners.MouseWheel;
@@ -34,10 +38,10 @@ import Objects.Toilet;
 import Objects.Wall;
 
 @SuppressWarnings("serial")
-public class Panel extends JPanel
+public class Panel extends JPanel implements ActionListener
 {
 
-	BufferedImage grass,sand;
+	BufferedImage grass, sand;
 	BufferedImage background;
 	BufferedImage podiumImage, toiletImage, entranceImage, pathImage, wallImage, foodImage;
 
@@ -45,6 +49,7 @@ public class Panel extends JPanel
 
 	private ArrayList<BufferedImage> panelInfo = new ArrayList<BufferedImage>();
 	// private ArrayList<Object> panelTypes = new ArrayList<Object>();
+	ArrayList<Visitor> visitors = new ArrayList<>();
 
 	ArrayList<DrawObject> objects = new ArrayList<>();
 	ArrayList<Path> paths = new ArrayList<>();
@@ -57,12 +62,16 @@ public class Panel extends JPanel
 
 	Point2D cameraPoint = new Point2D.Double(getWidth() / 2, getHeight() / 2);
 	float cameraScale = 1;
-
 	PropertiesPanel pp;
-
+	Agenda agenda;
 	Point2D lastClickPosition = new Point(0, 0);
 	Point lastMousePosition = new Point(0, 0);
-	Point2D selectionPosition = new Point(0,0);
+	Point2D selectionPosition = new Point(0, 0);
+	Images images = new Images();
+	javax.swing.Timer t;
+
+	int currentTime = 540;
+	int tick = 0;
 
 	// how to nieuwe dingen aan het panel toe te voegen:
 	// maak bufferedimage global aan, voeg er een image aan toe, en voeg de
@@ -70,11 +79,13 @@ public class Panel extends JPanel
 	// en maak een case statement die een new Object returnt in
 	// createNewDrawObject.
 
-	public Point2D getSelectionPosition() {
+	public Point2D getSelectionPosition()
+	{
 		return selectionPosition;
 	}
 
-	public void setSelectionPosition(Point2D selectionPosition) {
+	public void setSelectionPosition(Point2D selectionPosition)
+	{
 		this.selectionPosition = selectionPosition;
 	}
 
@@ -93,7 +104,8 @@ public class Panel extends JPanel
 			wallImage = ImageIO.read(new File("images/wallIcon.png"));
 			foodImage = ImageIO.read(new File("images/foodIcon.png"));
 			background = grass;
-		} catch (IOException e)
+		}
+		catch (IOException e)
 		{
 			e.printStackTrace();
 		}
@@ -104,6 +116,8 @@ public class Panel extends JPanel
 		panelInfo.add(wallImage);
 		panelInfo.add(foodImage);
 
+		agenda = new Agenda();
+
 		panelInfox = 0;
 		panelInfoy = 0;
 		scrollfactor = 0;
@@ -117,6 +131,7 @@ public class Panel extends JPanel
 		addMouseMotionListener(new MouseMotion(this));
 
 		addMouseWheelListener(new MouseWheel(this));
+		t = new Timer(1000 / 100, this);
 	}
 
 	public int getPanelInfoLength()
@@ -134,7 +149,6 @@ public class Panel extends JPanel
 	{
 		switch (index)
 		{
-
 			case 0:
 				return new Stage(null);
 			case 1:
@@ -157,6 +171,19 @@ public class Panel extends JPanel
 		objects.add(dragObject);
 	}
 
+	public void addVisitors()
+	{
+		visitors.add(new Visitor("visitor", new Point(100, 300), agenda, objects));
+	}
+
+	public void addVisitors(int count)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			visitors.add(new Visitor("visitor", new Point(100, 300), agenda, objects));
+		}
+	}
+
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);
@@ -179,27 +206,35 @@ public class Panel extends JPanel
 
 		TexturePaint p = new TexturePaint(background, new Rectangle2D.Double(0, 0, 100, 100));
 		g2.setPaint(p);
-		g2.fill(new Rectangle2D.Double(-width/2,-height/2, width, height));
+
+		g2.fill(new Rectangle2D.Double(-width / 2, -height / 2, width, height));
 
 		BasicStroke stroke = new BasicStroke(10);
 		g2.setStroke(stroke);
-		
-		for(Path path : paths) {
+
+		for (Path path : paths)
+		{
 			path.draw(g2);
 		}
 		for (DrawObject o : objects)
 		{
 			o.draw(g2);
 		}
-		g2.setTransform(oldTransform);
-		if(currentPath != null) { //Display text while in path making modes.
-			g2.setColor(Color.WHITE);
-			g2.setFont(new Font("Verdana",Font.ITALIC,25));
-			g2.drawString("Press enter to finish the path.",20,185);
+
+		for (Visitor v : visitors)
+		{
+			v.draw(g2);
 		}
 
+		g2.setTransform(oldTransform);
+		if (currentPath != null)
+		{ // Display text while in path making modes.
+			g2.setColor(Color.WHITE);
+			g2.setFont(new Font("Verdana", Font.ITALIC, 25));
+			g2.drawString("Press enter to finish the path.", 20, 185);
+		}
 		g2.setClip(null);
-		
+
 	}
 
 	public AffineTransform getCamera()
@@ -215,7 +250,8 @@ public class Panel extends JPanel
 		try
 		{
 			return getCamera().inverseTransform(point, null);
-		} catch (NoninvertibleTransformException e1)
+		}
+		catch (NoninvertibleTransformException e1)
 		{
 			e1.printStackTrace();
 		}
@@ -277,6 +313,11 @@ public class Panel extends JPanel
 		this.lastClickPosition = lastClickPosition;
 	}
 
+	public void clearObjects()
+	{
+		objects.clear();
+	}
+
 	public Point getLastMousePosition()
 	{
 		return lastMousePosition;
@@ -359,7 +400,9 @@ public class Panel extends JPanel
 
 	/**
 	 * Remove a DrawObject from the list.
-	 * @param o - the DrawObject you want to remove from the list.
+	 * 
+	 * @param o
+	 *            - the DrawObject you want to remove from the list.
 	 */
 	public void removeObject(DrawObject o)
 	{
@@ -375,61 +418,77 @@ public class Panel extends JPanel
 			repaint();
 		}
 	}
-	
-	public void clearObjectSelection() {
-		for(DrawObject o : objects) {
+
+	public void clearObjectSelection()
+	{
+		for (DrawObject o : objects)
+		{
 			o.setSelected(false);
 		}
 	}
-	
-	public void checkCollision() {
+
+	public void checkCollision()
+	{
 		boolean collision = false;
-		for(DrawObject o : getObjects()) {
-			if(getSelectedObject().collision(o) && o != getSelectedObject()) {
+		for (DrawObject o : getObjects())
+		{
+			if (getSelectedObject().collision(o) && o != getSelectedObject())
+			{
 				collision = true;
 				getSelectedObject().setRectangleColor(Color.RED);
 				break;
 			}
-			if(!collision) 
+			if (!collision)
 				getSelectedObject().setRectangleColor(Color.BLACK);
 		}
 	}
-	
+
 	/**
 	 * Begin making a new path.
 	 */
-	public void startPath() {
+	public void startPath()
+	{
 		setClickedOption("Path");
 		currentPath = new Path();
 		paths.add(currentPath);
 		pp.setSelectedPath(currentPath);
 	}
-	
+
 	/**
 	 * Get the current selected Path.
+	 * 
 	 * @return - the selected Path.
 	 */
-	public Path getCurrentPath() {
+	public Path getCurrentPath()
+	{
 		return currentPath;
 	}
-	
+
 	/**
 	 * Set the selected Path object.
-	 * @param path - the selected Path object.
+	 * 
+	 * @param path
+	 *            - the selected Path object.
 	 */
-	public void setcurrentPath(Path path) {
+	public void setcurrentPath(Path path)
+	{
 		currentPath = path;
 		pp.setSelectedPath(currentPath);
 	}
-	
+
 	/**
 	 * Checks if the point is contained in one of the path's.
-	 * @param point - The point to check for.
+	 * 
+	 * @param point
+	 *            - The point to check for.
 	 * @return if the point is contained in one of the path's.
 	 */
-	public boolean checkPath(Point2D point) {
-		for(Path path : paths) {
-			if(path.containsPoint(point)) {
+	public boolean checkPath(Point2D point)
+	{
+		for (Path path : paths)
+		{
+			if (path.containsPoint(point))
+			{
 				setcurrentPath(path);
 				setClickedOption("Path");
 				return true;
@@ -437,15 +496,20 @@ public class Panel extends JPanel
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Remove a path from the list.
-	 * @param path - the path you want to remove from the list.
+	 * 
+	 * @param path
+	 *            - the path you want to remove from the list.
 	 */
-	public void removePath(Path path) {
+	public void removePath(Path path)
+	{
 		Iterator<Path> it = paths.iterator();
-		while(it.hasNext()) {
-			if(it.next().equals(path)) {
+		while (it.hasNext())
+		{
+			if (it.next().equals(path))
+			{
 				pp.clearSelected();
 				setClickedOption("drag");
 				currentPath = null;
@@ -454,14 +518,55 @@ public class Panel extends JPanel
 			repaint();
 		}
 	}
-	
-	public void newWorld(int width, int height, int terrainIndex) {
+
+	public Agenda getAgenda()
+	{
+		return agenda;
+	}
+
+	public void setAgenda(Agenda agenda)
+	{
+		this.agenda = agenda;
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e)
+	{
+		tick++;
+		if (tick >= 10 && visitors.size() > 0)
+		{
+			tick = 0;
+			currentTime++;
+			System.out.println(currentTime);
+		}
+
+		for (Visitor v : visitors)
+		{
+			v.update(objects, currentTime, visitors);
+		}
+		repaint();
+
+	}
+
+	public javax.swing.Timer getT()
+	{
+		return t;
+	}
+
+	public void setT(javax.swing.Timer t)
+	{
+		this.t = t;
+	}
+
+	public void newWorld(int width, int height, int terrainIndex)
+	{
 		this.width = width;
 		this.height = height;
 		paths.clear();
 		objects.clear();
 		cameraScale = 1;
-		switch(terrainIndex) {
+		switch (terrainIndex)
+		{
 			case 0:
 				background = grass;
 				break;
diff --git a/Applicatie/PropertiesPanel.java b/Applicatie/PropertiesPanel.java
index 8ac8164..c765789 100644
--- a/Applicatie/PropertiesPanel.java
+++ b/Applicatie/PropertiesPanel.java
@@ -23,21 +23,20 @@ import javax.swing.JTextField;
 import Objects.DrawObject;
 import Objects.Path;
 
-
 @SuppressWarnings("serial")
 public class PropertiesPanel extends JPanel
 {
 
 	DrawObject selectedObject = null;
 	Path selectedPath = null;
-	
+
 	Panel p = null;
 
-	Dimension spacerDimension = new Dimension(200, 30);
+	Dimension spacerDimension = new Dimension(200, 10);
 
-	
 	JLabel nameLabel;
 	JPanel areaPanel;
+	Component rigidArea;
 
 	JTextField locationXField;
 	JTextField locationYField;
@@ -87,11 +86,14 @@ public class PropertiesPanel extends JPanel
 		buttonPanel.setMaximumSize(new Dimension(200, 40));
 		buttonPanel.add(buttonLabel);
 		add(buttonPanel);
-		
-		//AREA PANEL: AVAILABLE FOR ACTIONLISTENER
+
+		// AREA PANEL: AVAILABLE FOR ACTIONLISTENER
 		areaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 		areaPanel.setVisible(false);
 
+		rigidArea = Box.createRigidArea(spacerDimension);
+		rigidArea.setVisible(false);
+
 		// BUTTONS ROW 1
 		JPanel row1ButtonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 		JButton deleteButton = new JButton("Delete");
@@ -100,9 +102,10 @@ public class PropertiesPanel extends JPanel
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				if(selectedObject != null)
+				if (selectedObject != null)
 					p.removeObject(selectedObject);
-				else if(selectedPath != null) {
+				else if (selectedPath != null)
+				{
 					p.removePath(selectedPath);
 				}
 			}
@@ -114,6 +117,8 @@ public class PropertiesPanel extends JPanel
 			public void actionPerformed(ActionEvent e)
 			{
 				areaPanel.setVisible(!areaPanel.isVisible());
+				rigidArea.setVisible(!rigidArea.isVisible());
+
 			}
 		});
 		row1ButtonPanel.setPreferredSize(new Dimension(200, 50));
@@ -121,9 +126,10 @@ public class PropertiesPanel extends JPanel
 		row1ButtonPanel.add(deleteButton);
 		row1ButtonPanel.add(areaButton);
 		add(row1ButtonPanel);
-		
-		
-		//AREA PANEL
+
+		add(rigidArea);
+
+		// AREA PANEL
 		JLabel areaLabel = new JLabel("Area size");
 		areaLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
 		areaPanel.setPreferredSize(new Dimension(200, 150));
@@ -139,11 +145,14 @@ public class PropertiesPanel extends JPanel
 			areaTopPanel.add(areaTopLabel);
 			areaTopField = new JTextField();
 			areaTopField.setPreferredSize(new Dimension(140, 25));
+
 			{
 				areaTopField.addKeyListener(new KeyListener()
 				{
 
-					public void keyTyped(KeyEvent e){}
+					public void keyTyped(KeyEvent e)
+					{
+					}
 
 					public void keyReleased(KeyEvent e)
 					{
@@ -153,13 +162,16 @@ public class PropertiesPanel extends JPanel
 							int top = Integer.parseInt(areaTopField.getText());
 							selectedObject.setAreaTop(top);
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							areaTopField.setBackground(Color.RED);
 						}
 					}
 
-					public void keyPressed(KeyEvent e){}
+					public void keyPressed(KeyEvent e)
+					{
+					}
 				});
 			}
 			areaTopPanel.add(areaTopField);
@@ -167,6 +179,7 @@ public class PropertiesPanel extends JPanel
 		{
 			JPanel areaBottomPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 			areaBottomPanel.setPreferredSize(new Dimension(200, 50));
+
 			areaPanel.add(areaBottomPanel);
 
 			JLabel areaBottomLabel = new JLabel("Bottom");
@@ -177,7 +190,9 @@ public class PropertiesPanel extends JPanel
 				areaBottomField.addKeyListener(new KeyListener()
 				{
 
-					public void keyTyped(KeyEvent e){}
+					public void keyTyped(KeyEvent e)
+					{
+					}
 
 					public void keyReleased(KeyEvent e)
 					{
@@ -187,13 +202,16 @@ public class PropertiesPanel extends JPanel
 							int bottom = Integer.parseInt(areaBottomField.getText());
 							selectedObject.setAreaBottom(bottom);
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							areaBottomField.setBackground(Color.RED);
 						}
 					}
 
-					public void keyPressed(KeyEvent e){}
+					public void keyPressed(KeyEvent e)
+					{
+					}
 				});
 			}
 			areaBottomPanel.add(areaBottomField);
@@ -211,7 +229,9 @@ public class PropertiesPanel extends JPanel
 				areaLeftField.addKeyListener(new KeyListener()
 				{
 
-					public void keyTyped(KeyEvent e){}
+					public void keyTyped(KeyEvent e)
+					{
+					}
 
 					public void keyReleased(KeyEvent e)
 					{
@@ -221,19 +241,23 @@ public class PropertiesPanel extends JPanel
 							int left = Integer.parseInt(areaLeftField.getText());
 							selectedObject.setAreaLeft(left);
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							areaLeftField.setBackground(Color.RED);
 						}
 					}
 
-					public void keyPressed(KeyEvent e){}
+					public void keyPressed(KeyEvent e)
+					{
+					}
 				});
 			}
 			areaLeftPanel.add(areaLeftField);
 		}
 		{
 			JPanel areaRightPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
 			areaRightPanel.setPreferredSize(new Dimension(200, 50));
 			areaPanel.add(areaRightPanel);
 
@@ -245,7 +269,9 @@ public class PropertiesPanel extends JPanel
 				areaRightField.addKeyListener(new KeyListener()
 				{
 
-					public void keyTyped(KeyEvent e){}
+					public void keyTyped(KeyEvent e)
+					{
+					}
 
 					public void keyReleased(KeyEvent e)
 					{
@@ -255,13 +281,16 @@ public class PropertiesPanel extends JPanel
 							int right = Integer.parseInt(areaRightField.getText());
 							selectedObject.setAreaRight(right);
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							areaRightField.setBackground(Color.RED);
 						}
 					}
 
-					public void keyPressed(KeyEvent e){}
+					public void keyPressed(KeyEvent e)
+					{
+					}
 				});
 			}
 			areaRightPanel.add(areaRightField);
@@ -274,13 +303,13 @@ public class PropertiesPanel extends JPanel
 		JPanel locationPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 		JLabel locationLabel = new JLabel("Location");
 		locationLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
-		locationPanel.setPreferredSize(new Dimension(200, 150));
-		locationPanel.setMaximumSize(new Dimension(200, 150));
+		locationPanel.setPreferredSize(new Dimension(200, 110));
+		locationPanel.setMaximumSize(new Dimension(200, 110));
 		locationPanel.add(locationLabel);
 		add(locationPanel);
 		{
 			JPanel locationXPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-			locationXPanel.setPreferredSize(new Dimension(200, 50));
+			locationXPanel.setPreferredSize(new Dimension(200, 30));
 			locationPanel.add(locationXPanel);
 
 			JLabel locationXLabel = new JLabel("X");
@@ -303,7 +332,8 @@ public class PropertiesPanel extends JPanel
 							double xpos = Double.parseDouble(locationXField.getText());
 							selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY()));
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							locationXField.setBackground(Color.RED);
 						}
@@ -318,7 +348,7 @@ public class PropertiesPanel extends JPanel
 		}
 		{
 			JPanel locationYPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-			locationYPanel.setPreferredSize(new Dimension(200, 50));
+			locationYPanel.setPreferredSize(new Dimension(200, 30));
 			locationPanel.add(locationYPanel);
 
 			JLabel locationYLabel = new JLabel("Y");
@@ -342,7 +372,8 @@ public class PropertiesPanel extends JPanel
 							selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos));
 							;
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 
 							locationYField.setBackground(Color.RED);
@@ -362,13 +393,13 @@ public class PropertiesPanel extends JPanel
 		JPanel scalePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 		JLabel scaleLabel = new JLabel("Scale");
 		scaleLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
-		scalePanel.setPreferredSize(new Dimension(200, 100));
-		scalePanel.setMaximumSize(new Dimension(200, 100));
+		scalePanel.setPreferredSize(new Dimension(200, 70));
+		scalePanel.setMaximumSize(new Dimension(200, 70));
 		scalePanel.add(scaleLabel);
 		add(scalePanel);
 		{
 			JPanel scalePanel2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
-			scalePanel2.setPreferredSize(new Dimension(200, 50));
+			scalePanel2.setPreferredSize(new Dimension(200, 30));
 			scalePanel.add(scalePanel2);
 
 			JLabel scale2Label = new JLabel(" ");
@@ -391,7 +422,8 @@ public class PropertiesPanel extends JPanel
 							double scale = Double.parseDouble(scaleField.getText());
 							selectedObject.setScale(scale);
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							scaleField.setBackground(Color.RED);
 						}
@@ -409,13 +441,13 @@ public class PropertiesPanel extends JPanel
 		JPanel rotationPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 		JLabel rotationLabel = new JLabel("Rotation");
 		rotationLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
-		rotationPanel.setPreferredSize(new Dimension(200, 100));
-		rotationPanel.setMaximumSize(new Dimension(200, 100));
+		rotationPanel.setPreferredSize(new Dimension(200, 80));
+		rotationPanel.setMaximumSize(new Dimension(200, 80));
 		rotationPanel.add(rotationLabel);
 		add(rotationPanel);
 		{
 			JPanel rotationPanel2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
-			rotationPanel2.setPreferredSize(new Dimension(200, 50));
+			rotationPanel2.setPreferredSize(new Dimension(200, 30));
 			rotationPanel.add(rotationPanel2);
 
 			JLabel rotation2Label = new JLabel(" ");
@@ -439,7 +471,8 @@ public class PropertiesPanel extends JPanel
 							rotationField.setText(rotation + "");
 							selectedObject.setRotation(rotation);
 							p.update();
-						} catch (NumberFormatException nfe)
+						}
+						catch (NumberFormatException nfe)
 						{
 							rotationField.setBackground(Color.RED);
 						}
@@ -486,8 +519,8 @@ public class PropertiesPanel extends JPanel
 
 	public void update()
 	{
-		if(selectedObject != null)
-			fillFields();	
+		if (selectedObject != null)
+			fillFields();
 	}
 
 	private void enableComponents(Container container, boolean enable)
@@ -522,22 +555,23 @@ public class PropertiesPanel extends JPanel
 
 		nameLabel.setText("No Selection");
 		areaPanel.setVisible(false);
+		rigidArea.setVisible(false);
 	}
 
 	private void fillFields()
 	{
-		
-			nameLabel.setText(selectedObject.getName());
 
-			locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
-			locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
-			scaleField.setText((double) Math.round(selectedObject.getScale() * 10) / 10 + "");
-			rotationField.setText(Math.round(selectedObject.getRotation() % 360) + "");
-			
-			areaTopField.setText(selectedObject.getAreaTop() + "");
-			areaBottomField.setText(selectedObject.getAreaBottom() + "");
-			areaLeftField.setText(selectedObject.getAreaLeft() + "");
-			areaRightField.setText(selectedObject.getAreaRight() + "");
+		nameLabel.setText(selectedObject.getName());
+
+		locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
+		locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
+		scaleField.setText((double) Math.round(selectedObject.getScale() * 10) / 10 + "");
+		rotationField.setText(Math.round(selectedObject.getRotation() % 360) + "");
+
+		areaTopField.setText(selectedObject.getAreaTop() + "");
+		areaBottomField.setText(selectedObject.getAreaBottom() + "");
+		areaLeftField.setText(selectedObject.getAreaLeft() + "");
+		areaRightField.setText(selectedObject.getAreaRight() + "");
 
 	}
 
@@ -545,14 +579,16 @@ public class PropertiesPanel extends JPanel
 	{
 		this.p = p;
 	}
-	
-	public void setSelectedPath(Path path) {
+
+	public void setSelectedPath(Path path)
+	{
 		selectedObject = null;
 		selectedPath = path;
 		fillPathFields();
 	}
-	
-	private void fillPathFields() {
+
+	private void fillPathFields()
+	{
 		nameLabel.setText("Path");
 		enableComponents(this, true);
 		locationXField.setEnabled(false);
diff --git a/Applicatie/SaveLoad.java b/Applicatie/SaveLoad.java
new file mode 100644
index 0000000..a1e22c5
--- /dev/null
+++ b/Applicatie/SaveLoad.java
@@ -0,0 +1,144 @@
+package Applicatie;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
+
+import Objects.DrawObject;
+
+public class SaveLoad {
+
+	
+	public static void save(Panel panel)
+	{
+		JFileChooser fileChooser = new JFileChooser();
+		
+		fileChooser.setFileFilter(new FileFilter() {
+				@Override
+				public boolean accept(File pathname) {
+					if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+					{
+						return true;
+					}else if(pathname.isDirectory()){return true;}else{return false;}
+				}
+
+				@Override
+				public String getDescription() {
+					return ".agn";	
+				}
+			
+		});
+		fileChooser.setDialogTitle("Choose save location");
+		int userSelection = fileChooser.showSaveDialog(null);
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
+		{
+			File file = fileChooser.getSelectedFile();
+			if(!file.getName().endsWith(".agn"))
+			{
+				file = new File(file.getAbsolutePath() + ".agn");
+			}
+			
+			if(file.exists())
+			{
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				{
+					saveTerrain(file, panel);
+				}
+			}
+			else
+			{
+				saveTerrain(file, panel);
+			}
+		}
+	}
+	
+	
+	public static void saveTerrain(File file, Panel panel) {
+
+		try {
+			FileOutputStream fos = new FileOutputStream(file);
+			ObjectOutputStream oos = new ObjectOutputStream(fos);
+			for (DrawObject object : panel.objects) {
+				oos.writeObject(object);
+			}
+			oos.close();
+			JOptionPane.showMessageDialog(null, "Saved succesfully");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}		
+	
+	public static void load(Panel panel)
+	{
+		JFileChooser fileChooser = new JFileChooser();
+		fileChooser.setFileFilter(new FileFilter() {
+			@Override
+			public boolean accept(File pathname) {
+				if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+				{
+					return true;
+				}else if(pathname.isDirectory()){return true;}else{return false;}
+			}
+
+			@Override
+			public String getDescription() {
+				return ".agn";
+			}
+		
+		});
+		
+		fileChooser.setDialogTitle("Choose file");
+		int userSelection = fileChooser.showOpenDialog(null);
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
+		{
+			File file = fileChooser.getSelectedFile();
+			if(!file.exists())
+			{
+				JOptionPane.showMessageDialog(null, "This file does not exist: " + file.getName());
+			}
+			else
+			{
+				fillTerrain(file, panel);
+				JOptionPane.showMessageDialog(null, "Loaded succesfully");
+			}
+		}
+	}
+	
+	
+	public static void fillTerrain(File file, Panel panel) {
+		FileInputStream fis = null;
+		ObjectInputStream ois = null;
+
+		try {
+			
+			fis = new FileInputStream(file);
+			ois = new ObjectInputStream(fis);
+
+			Object object;
+			object = ois.readObject();
+			try {
+				panel.clearObjects();
+				while (object != null) {
+					panel.objects.add((DrawObject) object); 					
+					object = ois.readObject();
+				}
+			} catch (EOFException e) {
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		panel.update();
+	}
+	
+	
+	
+}
diff --git a/Applicatie/Visitor.java b/Applicatie/Visitor.java
new file mode 100644
index 0000000..e592ca7
--- /dev/null
+++ b/Applicatie/Visitor.java
@@ -0,0 +1,223 @@
+package Applicatie;
+
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+
+import Agenda.Agenda;
+import Agenda.Event;
+import Objects.DrawObject;
+
+public class Visitor
+{
+
+	Point2D position;
+	double rotation;
+	double scale;
+	double speed;
+	String filename;
+	ArrayList<Action> actions;
+	Agenda agenda;
+	ArrayList<DrawObject> objects;
+
+	public Visitor(String filename, Point2D position, Agenda agenda, ArrayList<DrawObject> objects)
+	{
+		this.position = position;
+		this.filename = filename;
+		this.rotation = 0;
+		this.speed = 1 + Math.random() * 4;
+		scale = 1;
+		actions = new ArrayList<Action>();
+		this.agenda = agenda;
+		this.objects = objects;
+		fillActions();
+	}
+
+	public void draw(Graphics2D g2)
+	{
+		AffineTransform tx = getTransform();
+		Image image = Images.getImage(filename);
+		g2.drawImage(image, tx, null);
+	}
+
+	private AffineTransform getTransform()
+	{
+		Image image = Images.getImage(filename);
+		AffineTransform tx = new AffineTransform();
+		tx.scale(scale, scale);
+		tx.translate(position.getX(), position.getY());
+//		System.out.println(position.getX());
+		tx.rotate(rotation, image.getWidth(null) / 2, image.getHeight(null) / 2);
+		return tx;
+	}
+
+	public void update(ArrayList<DrawObject> objects, int currentTime, ArrayList<Visitor> visitors)
+	{
+		Point2D target = new Point(500, 500);
+		for (Action a : actions)
+		{
+			if (currentTime >= a.getStartTime() && currentTime < a.getStoptime())
+			{
+				target = a.getPosition();
+			}
+
+		}
+		moveToTarget(target, objects, visitors);
+	}
+
+	public void moveToTarget(Point2D target, ArrayList<DrawObject> objects, ArrayList<Visitor> visitors)
+	{
+
+		double newRot = Math.atan2(target.getY() - position.getY(), target.getX() - position.getX());
+
+		int difx = (int) (target.getX() - position.getX());
+		int dify = (int) (target.getY() - position.getY());
+		int distance = (int) Math.sqrt((difx * difx) + (dify * dify));
+
+		if (rotation > newRot && distance > 10)
+		{
+			rotation -= 0.15;
+		}
+		else if (rotation < newRot && distance > 10)
+		{
+			rotation += 0.15;
+		}
+
+		Point2D oldPosition = position;
+
+		// face direction
+		float directionX = (float) Math.cos(rotation);
+		float directionY = (float) Math.sin(rotation);
+
+		if (distance > 10)
+		{
+			position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
+		}
+
+		boolean possible = true;
+		for (DrawObject object : objects)
+		{
+			if (hitTest(object))
+			{
+				possible = false;
+			}
+		}
+		for (Visitor object : visitors)
+		{
+			if (hitTestVisitor(object) && object != this)
+			{
+				possible = false;
+			}
+		}
+		if (possible == false)
+		{
+			position = oldPosition;
+			rotation += 0.2;
+		}
+	}
+
+	public void fillActions()
+	{
+		int startTime = 540;
+		int stopTime = 1260;
+
+		while (startTime < stopTime)
+		{
+			int random = (int) Math.floor(Math.random() * 51);
+			if (random < 30)
+			{
+				Point2D position = null;
+				for (Event e : agenda.getEvents())
+				{
+					if (convertMinutesToHours(startTime) > e.getStart() && convertMinutesToHours(startTime) < e.getStop())
+					{
+						for (DrawObject d : objects)
+						{
+							if (d.getFileName().equals(e.getStage().getName()))
+							{
+								position = d.getPosition();
+							}
+						}
+					}
+				}
+				int randomtime = (int) (40 + (Math.random() * (60 - 40)));
+				if (position != null)
+				{
+					actions.add(new Action(position, startTime, randomtime));
+				}
+				startTime = startTime + randomtime;
+
+			}
+			else if (random >= 30 && random < 35)
+			{
+				Point2D position = null;
+				for (DrawObject d : objects)
+				{
+					if (d.getFileName().equals("entrance"))
+					{
+						position = d.getPosition();
+					}
+				}
+				if (position != null)
+				{
+					actions.add(new Action(position, startTime, 35));
+					startTime = startTime + 35;
+				}
+				startTime = startTime + 35;
+
+			}
+			else if (random > 35)
+			{
+				Point2D position = null;
+				for (DrawObject d : objects)
+				{
+					if (d.getFileName().equals("wc"))
+					{
+						position = d.getPosition();
+					}
+				}
+				if (position != null)
+				{
+					actions.add(new Action(position, startTime, 35));
+				}
+				startTime = startTime + 35;
+
+			}
+		}
+	}
+
+	public int convertMinutesToHours(int startTime)
+	{
+		int time = 0;
+		int hours = startTime / 60;
+		int minutes = startTime % 60;
+		time = (hours * 100) + minutes;
+		return time;
+	}
+
+	public int getEndX()
+	{
+		Image image = Images.getImage(filename);
+		return (int) (position.getX() + image.getWidth(null));
+	}
+
+	public int getEndY()
+	{
+		Image image = Images.getImage(filename);
+		return (int) (position.getY() + image.getHeight(null));
+	}
+
+	public boolean hitTest(DrawObject to2)
+	{
+		return (getEndX() >= to2.getPosition().getX() && getEndY() >= to2.getPosition().getY() && to2.getEndX() >= position.getX() && to2.getEndY() >= position.getY());
+
+	}
+
+	public boolean hitTestVisitor(Visitor v)
+	{
+		return (getEndX() >= v.position.getX() && getEndY() >= v.position.getY() && v.getEndX() >= position.getX() && v.getEndY() >= position.getY());
+	}
+}
\ No newline at end of file
diff --git a/Applicatie/Window.java b/Applicatie/Window.java
index d696261..0539319 100644
--- a/Applicatie/Window.java
+++ b/Applicatie/Window.java
@@ -1,6 +1,7 @@
 package Applicatie;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -16,7 +17,8 @@ public class Window extends JFrame
 	Window() {
 		super("Festival Plannner");
 		setDefaultCloseOperation(EXIT_ON_CLOSE);
-		setSize(500, 600);
+		//setSize(500, 600);
+		setMinimumSize(new Dimension(1160, 680));
 		setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
 
 		// CONTENT PANELS
@@ -24,7 +26,11 @@ public class Window extends JFrame
 		PropertiesPanel pp = new PropertiesPanel();
 		fp = new Panel(pp);
 		contentPanel.add(fp, BorderLayout.CENTER);
+		ControlPanel cp = new ControlPanel(fp);
+		contentPanel.add(cp, BorderLayout.SOUTH);
 		contentPanel.add(pp, BorderLayout.EAST);
+		contentPanel.add(fp, BorderLayout.CENTER);
+		
 
 		addKeyListener(new Keyboard(fp));
 		setContentPane(contentPanel);
diff --git a/Listeners/Keyboard.java b/Listeners/Keyboard.java
index b2c5984..f647613 100644
--- a/Listeners/Keyboard.java
+++ b/Listeners/Keyboard.java
@@ -5,7 +5,9 @@ import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.geom.Point2D;
 
+import Applicatie.NewWorldPanel;
 import Applicatie.Panel;
+import Applicatie.SaveLoad;
 
 public class Keyboard implements KeyListener {
 
@@ -54,6 +56,15 @@ public class Keyboard implements KeyListener {
 		else if(e.getKeyCode() == e.VK_P) {
 			panel.startPath();
 		}
+		else if(e.getKeyCode() == e.VK_N) {
+			NewWorldPanel world = new NewWorldPanel(panel);
+		}
+		else if(e.getKeyCode() == e.VK_S) {
+			SaveLoad.save(panel);
+		}
+		else if(e.getKeyCode() == e.VK_O) {
+			SaveLoad.load(panel);
+		}
 		panel.repaint();
 	}
 
diff --git a/Listeners/MouseWheel.java b/Listeners/MouseWheel.java
index 4f6fcea..a9269b1 100644
--- a/Listeners/MouseWheel.java
+++ b/Listeners/MouseWheel.java
@@ -1,5 +1,6 @@
 package Listeners;
 
+import java.awt.Point;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import java.awt.geom.Point2D;
@@ -46,7 +47,13 @@ public class MouseWheel implements MouseWheelListener
 			if (cameraScale >= 0.1 && cameraScale < 4)
 			{
 				panel.setCameraScale((float) cameraScale);
-			}
+				//panel.setCameraPoint(new Point2D.Double(e.getX()-(panel.getWidth()/2)-panel.getCameraPoint().getX(), e.getY()-(panel.getHeight()/2) - panel.getCameraPoint().getY()));
+				//panel.setCameraPoint( new Point2D.Double( 
+				//							-panel.getClickPoint(new Point(e.getX(), e.getY())).getX(),
+				//							-panel.getClickPoint(new Point(e.getX(), e.getY())).getY()
+				//							));
+				//TODO FIX
+				}
 
 		}
 
diff --git a/Objects/DrawObject.java b/Objects/DrawObject.java
index ccb0aec..22e1c5b 100644
--- a/Objects/DrawObject.java
+++ b/Objects/DrawObject.java
@@ -10,18 +10,22 @@ import java.awt.geom.Ellipse2D;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
 
 import javax.swing.ImageIcon;
 
-public abstract class DrawObject
+import Applicatie.Images;
+
+public abstract class DrawObject implements Serializable
 {
 	Point2D position;
 	double rotation;
 	double scale;
 	int width;
 	int height;
-	private Image image;
+//	private Image image;
 	protected boolean selected;
+	private String filename;
 
 	protected int areaTop;
 	protected int areaBottom;
@@ -43,11 +47,12 @@ public abstract class DrawObject
 
 	public DrawObject(String filename, Point2D position)
 	{
-		image = new ImageIcon(filename).getImage();
+//		image = new ImageIcon(filename).getImage();
 
+		Image image = Images.getImage(filename);
 		width = image.getWidth(null);
 		height = image.getHeight(null);
-
+		this.filename = filename;
 		scale = 1;
 		rotation = 0;
 		this.position = position;
@@ -64,6 +69,7 @@ public abstract class DrawObject
 	public void draw(Graphics2D g)
 	{
 		AffineTransform tx = getTransform();
+		Image image = Images.getImage(filename);
 		g.drawImage(image, tx, null);
 		if (selected)
 		{
@@ -156,31 +162,7 @@ public abstract class DrawObject
 	}
 
 	/**
-	 * Method that gets all the corner
-	 * coordinates index: 0 -> top left 1 -> top right 3 -> bottom left 4 ->
-	 * bottom right
-	 * 
-	 * @return corner coordinates
-	 */
-	public Point2D[] getCorners()
-	{
-		Rectangle2D tempRekt = new Rectangle2D.Double(0, 0, image.getWidth(null), image.getHeight(null));
-		tempRekt.setFrame(getTransform().createTransformedShape(tempRekt).getBounds());
-		Point2D[] points = new Point2D[4];
-		Point2D point = new Point2D.Double(tempRekt.getX(), tempRekt.getY());
-		points[0] = point;
-		point = new Point2D.Double(tempRekt.getX() + tempRekt.getHeight(), tempRekt.getY());
-		points[1] = point;
-		point = new Point2D.Double(tempRekt.getX(), tempRekt.getY() + tempRekt.getHeight());
-		points[2] = point;
-		point = new Point2D.Double(tempRekt.getX() + tempRekt.getHeight(), tempRekt.getY() + tempRekt.getHeight());
-		points[3] = point;
-		return points;
-	}
-
-	/**
-	 * Checking
-	 * collision.
+	 * Checking collision.
 	 * 
 	 * @param object
 	 *            . the drawObject to check collision with.
@@ -273,16 +255,6 @@ public abstract class DrawObject
 		this.scale = scale;
 	}
 
-	public Image getImage()
-	{
-		return image;
-	}
-
-	public void setImage(Image image)
-	{
-		this.image = image;
-	}
-
 	public boolean isSelected()
 	{
 		return selected;
@@ -310,6 +282,7 @@ public abstract class DrawObject
 
 	public Rectangle2D getImageRectangle()
 	{
+		Image image = Images.getImage(filename);
 		return new Rectangle2D.Double(0, 0, image.getWidth(null), image.getHeight(null));
 	}
 
@@ -353,4 +326,21 @@ public abstract class DrawObject
 		this.areaRight = areaRight;
 	}
 
+	public int getEndX()
+	{
+		Image image = Images.getImage(filename);
+		return (int) (position.getX() + image.getWidth(null));
+	}
+
+	public int getEndY()
+	{
+		Image image = Images.getImage(filename);
+		return (int) (position.getY() + image.getHeight(null));
+	}
+
+	public String getFileName()
+	{
+		return filename;
+	}
+
 }
diff --git a/Objects/Entrance.java b/Objects/Entrance.java
index eab28db..f4de61b 100644
--- a/Objects/Entrance.java
+++ b/Objects/Entrance.java
@@ -7,7 +7,7 @@ public class Entrance extends DrawObject
 
 	public Entrance(Point2D position)
 	{
-		super("images/entrance.png", position);
+		super("entrance", position);
 	}
 
 	@Override
diff --git a/Objects/Food.java b/Objects/Food.java
index d6bdb65..3ef3973 100644
--- a/Objects/Food.java
+++ b/Objects/Food.java
@@ -5,7 +5,7 @@ import java.awt.geom.Point2D;
 public class Food extends DrawObject {
 
 	public Food(Point2D position) {
-		super("images/food.png", position);
+		super("food", position);
 	}
 
 	public String getName() {
diff --git a/Objects/OldPath.java b/Objects/OldPath.java
new file mode 100644
index 0000000..c966ee4
--- /dev/null
+++ b/Objects/OldPath.java
@@ -0,0 +1,19 @@
+package Objects;
+
+import java.awt.geom.Point2D;
+
+public class OldPath extends DrawObject
+{
+
+	public OldPath(Point2D position)
+	{
+		super("path", position);
+	}
+
+	@Override
+	public String getName()
+	{
+		return "Path";
+	}
+
+}
diff --git a/Objects/Stage.java b/Objects/Stage.java
index 2c3b82c..c006d71 100644
--- a/Objects/Stage.java
+++ b/Objects/Stage.java
@@ -6,7 +6,7 @@ public class Stage extends DrawObject
 {
 	public Stage(Point2D position)
 	{
-		super("images/stage4.png", position);
+		super("stage", position);
 	}
 
 	@Override
diff --git a/Objects/Toilet.java b/Objects/Toilet.java
index 3a8708a..f15000f 100644
--- a/Objects/Toilet.java
+++ b/Objects/Toilet.java
@@ -7,7 +7,7 @@ public class Toilet extends DrawObject
 
 	public Toilet(Point2D position)
 	{
-		super("images/wc.png", position);
+		super("wc", position);
 	}
 
 	@Override
diff --git a/Objects/Wall.java b/Objects/Wall.java
index e79b3c1..a1341f1 100644
--- a/Objects/Wall.java
+++ b/Objects/Wall.java
@@ -7,7 +7,7 @@ public class Wall extends DrawObject
 
 	public Wall(Point2D position)
 	{
-		super("images/wall.png", position);
+		super("wall", position);
 	}
 
 	@Override