Rebased borked; manually added files.