Added argument parsing and options (when I need them)