Added my stuff to exercise1 + restructured a bit