catching up on hw commits