Restructuring the code, adding the contains checkpoint helper function

Restructuring the code, adding the contains checkpoint helper function #13