Solution to challenge 15
Challenge 16 solved
Removed State class