Some not working commit.
Almost working.
Merge branch 'cmd-options'