Revisions/final one for tonight

Woo.