Initial work re: the new folders API