Second try at first commit in months. But it works