Slight problems still, but closer