Rebased, more WK2 work.