Added basic code for problem 2
Added test data for problem 2
Made it easier to switch problems + small fixes to problems