Set up rick and karla's part to be ready for jon's merge