updated through lecture 4 / hw3 -- now test