Updates
Final(ish?) version homework 1