added to list of notfinished
Took out generated files
Switched loops used for more readability