Changed to fit
Changed to fit
Created all supporting classes