week 4, needs some clenaing up but it works