I intend to split this into multiple changesets once I'm done with fixing all errors.