Now with argument parsing. Editing also works