Benedikt

Progress: Everything but extensive code review and tests. I had it uploaded at 5 o clock, but did not realize we had to make a pull request.