Starting to turn the super-rough draft in to a not-so-rough draft. Introduced some compilation issue, though.