Started refactoring the measurment equipment