5th commit

I could not finish due to time and because I chose variable that would
not work together ..