Before making big changes with the multi-threading hopefully
Rearranging command line parsing