DO NOT MERGE YET

This is a big PR - number of claimants - lots of front end and back end changes