finished assignment two and beginnings of assignment three