WIP - add Check field to the measurement

This PR aims to fully encapsulate the original Check within measurement