slight api change + inprogress tests