commit WIP on verb rewrite (untested)