Rearranged everything, added more things that can happen

It's all command line switches now.   I must however sleep.. so I'll
look at this again later.