more progress

review @den_sh