Final commit of my solution.