Some more progress but stilll erroring out