Added the beginnings of directory support