claim
makes claim work
rewrite claim
fix add customer
merging