Add options, first commit