updated from windows side and nearly working over there.