Adjusted options, got output to file working with various switches, need to create directory for output based on file name and do all db entry