About almost done

Needs relocation, so a commit is necessary first.