Final Commit 1.0: All with bonus 2 done
Bonus 1 : pending