Final version (unless something goes horribly wrong, or someone gets an ocd attack)