Finally done

Finished, I think.