WIP, homework 2