Some progress on hw04 - messy code, but it's progress