Check in of broken code trying to refactoring measurement management
system