cleaned up code and now just use id's in the directories and lookup files for names