Problem one and two completed