Modified some of the spike work for command line processing and location display