Changes to task 2. Added case system