Setting up for a few fairly large changes