Remove old databse part of function
Make more explicit generic method
Remove database from createFileCall, and switched the logic of the savename test