Interim commit of homework 3