Made slight changes to allow for variation in usage, will add command line flags for different functionality