Claims and Solutions Added - need to debug a few cases