Added directory support... so much for 1 commit