Add some opt parsing