Switch refinement
Began comparison code