Removed old solution to problem one
Spec and rework of problem 2