Pretty much done with #1