Another broken checkin - but code closer to working