Seems to have solved it! Now to tidy...