pushing some changes... syntactically correct, does not work yet
works (with a stub measurement)