Removed curLoc variables and updated class to use start variable.