more progress

review @densh