initial work for issue 399

not ready for merging
Long form arguments should use --, ie --force.