I think I finished teh thing now. Can you test this @AlexM850?