wfirst commit, work in progress