Post Demo 2

Everything that was in eclipse after our second demo