Final commit assignment 2