Week 1 mostly done. Need to pretty up the HTML