starting to build an argument array to decide what to do
basic checking stuff
add a comment
changing the flow slightly
forget that stuff for now
Merge branch 'master' into advanced-arguments