Fixed up

Pretty much done