Jeff: Finished Everything for CheckPoint
Merge pull request #1 from john3123/Jeff

Jeff: Last of Stuff for CheckPoint