Replace hard coded options with an actual option parser