Updates from Donal

I've started updating this and it's a WiP so definitely don't think about merging yet. :+1: