Creating multiple file call
Improved speed, consolidated to one file
Cleanup and rename