Exercise 1 - Update solution spec and associated files

TODO
Fix the solution itself
Exercise 1 - Completed

Merged in original exercise and made fixes
Exercise 2 - Completed

Updated for more interaction