Finished ex2
full commit