Finished (again) homework two