Initial work on Reparameterize