Feature/currency

I think some of this can be tidied up in our code review at the end of the week - but I'd like to merge it to master for now (as we're still in development on that branch anyway) and I've done a bit of tidying up regarding all the overlays and how the work, which would be useful for everyone else to have on their respective branches.