Added TODO's
Replaced checkClaim() with isClaimed()