Refactoring CLI to simplify and integrate with Spark model better

NOT READY FOR MERGE
Should this script go in a testing directory perhaps?