Added argument parsing and server