added command line arguments, CLEAN IT UP!