Add basic parsing and remove old arg parsing.