First commit in Moritz-branch
Added test
All classes so far
Changed framework
Merged in Moritz' work