Much progress on admin API