Revised. Pretty much done.