I've updated my branch

Let me know if this works, though I think I need to do some merging from the main branch too?