Almost done first pass. Will test making new directories shortly.