Splitting out code and bringing in the check framework