Making progress on these conversions
More conversion cases