Fixed eccentricity and setup initial code for change to config approach