Cmckee/merit

Think I finally fixed schema problems.
I have no idea what they are actually. I havent run into a place where they are relevant yet. I think it might relate to setting up the rules, which doesnt work anyway. This was auto generated from merit.