Whoops. Missed some bits. /Now/ it's complete.