Oops I messed up on resources; fixed, I think I can merge this now.