Issue 4,5

@CARammelkamp
~requested: 200


We were assigned 5, but did 4 on accident. Finished 5 afterwards.