Final commit barring unforeseen bugs.