Revert "Bah"

This reverts commit 991a2e198c2a11aae02be21aa6e0a5bfbf7b2615.
Changed nothing
UnitTests
Added assignment  35