This'll need to be rebased ontop of the recent memory mutex changes.