Pretty much done. Still ugly though.