Final commit before turning in first iteration of homework 5