diff --git a/prog2-codebase/.metadata/.log b/prog2-codebase/.metadata/.log
index 8fdb582..11b841d 100644
--- a/prog2-codebase/.metadata/.log
+++ b/prog2-codebase/.metadata/.log
@@ -765,3 +765,56 @@ user global configuration and to define the default location to store repositori
 not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+!SESSION 2022-05-11 16:41:37.328 -----------------------------------------------
+eclipse.buildId=4.23.0.I20220308-0310
+java.version=17.0.1
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE
+Framework arguments:  -product org.eclipse.epp.package.java.product
+Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product
+
+!ENTRY org.eclipse.jface 2 0 2022-05-11 16:41:57.902
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 16:41:57.903
+!MESSAGE A conflict occurred for CTRL+SHIFT+T:
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
+		Open a type in a Java editor,
+		Category(org.eclipse.ui.category.navigate,Navigate,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@f3876ef,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
+		,
+		Category(org.eclipse.lsp4e.category,Language Servers,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@6b751cb1,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 16:41:57.903
+!MESSAGE A conflict occurred for ALT+SHIFT+R:
+Binding(ALT+SHIFT+R,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring ,
+		Rename the selected element,
+		Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@df9d400,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(ALT+SHIFT+R,
+	ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename,
+		Rename the selected item,
+		Category(org.eclipse.ui.category.file,File,null,true),
+		org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@4ec427,
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+
+!ENTRY org.eclipse.egit.ui 2 0 2022-05-11 16:42:17.687
+!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
+user global configuration and to define the default location to store repositories: 'C:\Users\birgi'. If this is
+not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
+EGit might behave differently since they see different configuration options.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/14.tree b/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree
similarity index 98%
rename from prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/14.tree
rename to prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree
index 01593a3..c195699 100644
Binary files a/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/14.tree and b/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree differ
diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index ebeedf0..aecd12b 100644
Binary files a/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
index b8e9461..5a7215c 100644
--- a/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
+++ b/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
@@ -394,7 +394,7 @@
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_wY3XoMYpEeyGHfgv0QESBQ" elementId="org.eclipse.ui.workbench.file">
         <tags>Draggable</tags>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_WxCCkNCBEey_utsnKF1nUQ" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_vRHFY8YpEeyGHfgv0QESBQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_gzSdgNE4EeyNTJ1Vd4z80A" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_vRHFY8YpEeyGHfgv0QESBQ"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_wY3-sMYpEeyGHfgv0QESBQ" elementId="group.edit" toBeRendered="false">
         <tags>toolbarSeparator</tags>
@@ -425,7 +425,7 @@
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_wY-FUMYpEeyGHfgv0QESBQ" elementId="org.eclipse.ui.workbench.navigate">
         <tags>Draggable</tags>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_WxZO8NCBEey_utsnKF1nUQ" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" type="Check" command="_vQ_wosYpEeyGHfgv0QESBQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_gzrfENE4EeyNTJ1Vd4z80A" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" type="Check" command="_vQ_wosYpEeyGHfgv0QESBQ"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_wY_TcMYpEeyGHfgv0QESBQ" elementId="group.editor" toBeRendered="false">
         <tags>toolbarSeparator</tags>
@@ -2182,7 +2182,7 @@
   <addons xmi:id="_vNiM-cYpEeyGHfgv0QESBQ" elementId="MinMax Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon"/>
   <addons xmi:id="_vNiM-sYpEeyGHfgv0QESBQ" elementId="org.eclipse.ui.workbench.addon.0" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
   <addons xmi:id="_vOZvoMYpEeyGHfgv0QESBQ" elementId="SplitterAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon"/>
-  <addons xmi:id="_V5bsMNCBEey_utsnKF1nUQ" elementId="org.eclipse.ui.ide.addon.0" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/>
+  <addons xmi:id="_IYS0IKimEeS11vbz3f9ezw" elementId="org.eclipse.ui.ide.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.ide" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/>
   <addons xmi:id="_dz0JgGOlEeSMMaPQU2nlzw" elementId="org.eclipse.ui.ide.application.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon"/>
   <categories xmi:id="_vQOUkMYpEeyGHfgv0QESBQ" elementId="org.eclipse.team.ui.category.team" name="Version control (Team)" description="Actions that apply when working with a version control system"/>
   <categories xmi:id="_vQOUkcYpEeyGHfgv0QESBQ" elementId="org.eclipse.ui.category.views" name="Views" description="Commands for opening views"/>
diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/prog2-codebase/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
index 6b36e05..a665ce1 100644
Binary files a/prog2-codebase/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/prog2-codebase/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ
diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/prog2-codebase/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
index 32590d7..92523bc 100644
--- a/prog2-codebase/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
+++ b/prog2-codebase/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
@@ -12,3 +12,4 @@
 2022-05-07 09:35:29,236 [Worker-4: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
 2022-05-10 16:51:38,941 [Worker-5: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update.
 2022-05-10 18:51:10,274 [Worker-2: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
+2022-05-11 16:42:17,675 [Worker-5: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/prog2-codebase/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
index e6119bd..dc6e3dc 100644
--- a/prog2-codebase/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
+++ b/prog2-codebase/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
@@ -15,4 +15,12 @@
 	</section>
 	<section name="NewWizardAction">
 	</section>
+	<section name="ChooseWorkspaceDialogSettings">
+		<item key="DIALOG_X_ORIGIN" value="611"/>
+		<item key="DIALOG_Y_ORIGIN" value="269"/>
+	</section>
+	<section name="WORKBENCH_SETTINGS">
+		<list key="ENABLED_TRANSFERS">
+		</list>
+	</section>
 </section>
diff --git a/prog2-codebase/.metadata/version.ini b/prog2-codebase/.metadata/version.ini
index f97df4e..34675d0 100644
--- a/prog2-codebase/.metadata/version.ini
+++ b/prog2-codebase/.metadata/version.ini
@@ -1,3 +1,3 @@
-#Tue May 10 18:50:44 CEST 2022
+#Wed May 11 16:41:46 CEST 2022
 org.eclipse.core.runtime=2
 org.eclipse.platform=4.23.0.v20220308-0310
diff --git a/spaceinvaders/.gitignore b/spaceinvaders/.gitignore
new file mode 100644
index 0000000..e10e727
--- /dev/null
+++ b/spaceinvaders/.gitignore
@@ -0,0 +1 @@
+/.metadata/
diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore
new file mode 100644
index 0000000..aa21310
--- /dev/null
+++ b/spaceinvaders/GameProject/bin/.gitignore
@@ -0,0 +1,8 @@
+/base/
+/collider/
+/controller/
+/gameobjects/
+/log4j2.xml
+/playground/
+/rendering/
+/ui/
diff --git a/spaceinvaders/GameProject/bin/playground/LevelWithBox.class b/spaceinvaders/GameProject/bin/playground/LevelWithBox.class
index 4d9c8a7..929c989 100644
Binary files a/spaceinvaders/GameProject/bin/playground/LevelWithBox.class and b/spaceinvaders/GameProject/bin/playground/LevelWithBox.class differ
diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log
index 1a6119f..1f5c0de 100644
--- a/spaceinvaders/GameProject/log/log4j.log
+++ b/spaceinvaders/GameProject/log/log4j.log
@@ -799,3 +799,31 @@
 2022-05-11 16:12:33,399 INFO  playground.Animation - img added .\video/heart0.png
 2022-05-11 16:12:33,406 INFO  playground.Animation - img added .\video/heart1.png
 2022-05-11 16:12:33,412 INFO  playground.SpaceInvadersLevel - HIGHSCORE17200
+2022-05-11 19:07:24,183 INFO  base.GameLoop - GUI starts
+2022-05-11 19:07:27,125 INFO  base.GameLoop - GUI NEW
+2022-05-11 19:07:27,126 INFO  playground.SpaceInvadersLevel - PREPARE
+2022-05-11 19:07:27,298 INFO  playground.Animation - img added .\video/sweetAlien0.png
+2022-05-11 19:07:27,324 INFO  playground.Animation - img added .\video/sweetAlien1.png
+2022-05-11 19:07:27,335 INFO  playground.Animation - img added .\video/sweetAlien2.png
+2022-05-11 19:07:27,349 INFO  playground.Animation - img added .\video/sweetAlien3.png
+2022-05-11 19:07:27,365 INFO  playground.Animation - img added .\video/sweetAlien4.png
+2022-05-11 19:07:27,382 INFO  playground.Animation - img added .\video/sweetAlien5.png
+2022-05-11 19:07:27,394 INFO  playground.Animation - img added .\video/sweetAlien6.png
+2022-05-11 19:07:27,405 INFO  playground.Animation - img added .\video/sweetAlien7.png
+2022-05-11 19:07:27,445 INFO  playground.Animation - img added .\video/heart0.png
+2022-05-11 19:07:27,456 INFO  playground.Animation - img added .\video/heart1.png
+2022-05-11 19:07:27,473 INFO  playground.SpaceInvadersLevel - HIGHSCORE17200
+2022-05-11 19:07:39,897 INFO  base.GameLoop - GUI starts
+2022-05-11 19:07:42,759 INFO  base.GameLoop - GUI NEW
+2022-05-11 19:07:42,760 INFO  playground.SpaceInvadersLevel - PREPARE
+2022-05-11 19:07:42,902 INFO  playground.Animation - img added .\video/sweetAlien0.png
+2022-05-11 19:07:42,927 INFO  playground.Animation - img added .\video/sweetAlien1.png
+2022-05-11 19:07:42,938 INFO  playground.Animation - img added .\video/sweetAlien2.png
+2022-05-11 19:07:42,952 INFO  playground.Animation - img added .\video/sweetAlien3.png
+2022-05-11 19:07:42,968 INFO  playground.Animation - img added .\video/sweetAlien4.png
+2022-05-11 19:07:42,983 INFO  playground.Animation - img added .\video/sweetAlien5.png
+2022-05-11 19:07:42,995 INFO  playground.Animation - img added .\video/sweetAlien6.png
+2022-05-11 19:07:43,006 INFO  playground.Animation - img added .\video/sweetAlien7.png
+2022-05-11 19:07:43,043 INFO  playground.Animation - img added .\video/heart0.png
+2022-05-11 19:07:43,055 INFO  playground.Animation - img added .\video/heart1.png
+2022-05-11 19:07:43,073 INFO  playground.SpaceInvadersLevel - HIGHSCORE17200
diff --git a/spaceinvaders/GameProject/src/playground/LevelWithBox.java b/spaceinvaders/GameProject/src/playground/LevelWithBox.java
index 71f5a5b..580760c 100644
--- a/spaceinvaders/GameProject/src/playground/LevelWithBox.java
+++ b/spaceinvaders/GameProject/src/playground/LevelWithBox.java
@@ -12,9 +12,11 @@ public class LevelWithBox extends SpaceInvadersLevel {
 	    return "Box-Level!";
 	}
 	
+	GameObject RectOb = new RectObject("Obj", null, 350, 100, 0, 0, 700, 250, Color.RED);
+	
 	@Override
 	public void prepareLevel(String id) {
 		super.prepareLevel(id);
-		addObject();
+		addObject(RectOb);
 	}	
 }