Fix shitty bugs
Exercise 1 complete