Very messy, but this week now working