Fixed command line arguments
removed old files and touched up a few other files
changed cascade to class for more flexibility