Moved parse-args to obj
Cleaned up merge