Added separate voice lists.  Just need to have these dump to file now.  Also, cleaned out unnecessary code from the repository.