Initial pass at homework 2