First commit of hw7, with much left to do