First commit, working on options
First commit, working on options