Turns out I had a lot more work than I expected. I'll post tomorrow, sorry for the wait!