Resources now work.  Minimising the changes required to core