[WIP] Make Statement composite Claim

Tackles part of #22