Mostly working

Need to change the argparse stuff