Added more files
Updated to accept input primarily from I/O redirection