Halsafar required args

Get some of this into prod.  Passing tests.