moved things into subfolder, wrote enum pan digital did a couple problems