Refactored Argument parser to be non static

BVT test passes other tests fail per #3